diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2006-01-08 10:03:39 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 05:13:59 +0100 |
| commit | e78c9a004aadebe22306c81d1a7f1d1278dc37f9 (patch) | |
| tree | abbe82c7f8ce8d3059619c7941de14e585859aa4 | |
| parent | [PATCH] Documentation: Small applying-patches.txt update (diff) | |
| download | linux-e78c9a004aadebe22306c81d1a7f1d1278dc37f9.tar.xz linux-e78c9a004aadebe22306c81d1a7f1d1278dc37f9.zip | |
[PATCH] fs: remove s_old_blocksize from struct super_block
This patch inlines the single user of struct super_block field
s_old_blocksize and removes the field.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | fs/super.c | 3 | ||||
| -rw-r--r-- | include/linux/fs.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/fs/super.c b/fs/super.c index 5a347a4f673a..0a30e51692cf 100644 --- a/fs/super.c +++ b/fs/super.c @@ -700,8 +700,7 @@ struct super_block *get_sb_bdev(struct file_system_type *fs_type, s->s_flags = flags; strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id)); - s->s_old_blocksize = block_size(bdev); - sb_set_blocksize(s, s->s_old_blocksize); + sb_set_blocksize(s, block_size(bdev)); error = fill_super(s, data, flags & MS_VERBOSE ? 1 : 0); if (error) { up_write(&s->s_umount); diff --git a/include/linux/fs.h b/include/linux/fs.h index a1e28f0895c0..4c82219b0fae 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -808,7 +808,6 @@ struct super_block { struct list_head s_list; /* Keep this first */ dev_t s_dev; /* search index; _not_ kdev_t */ unsigned long s_blocksize; - unsigned long s_old_blocksize; unsigned char s_blocksize_bits; unsigned char s_dirt; unsigned long long s_maxbytes; /* Max file size */ |