Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e78c9a00 authored by Pekka Enberg's avatar Pekka Enberg Committed by Linus Torvalds
Browse files

[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: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 90f2447d

fs/super.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

include/linux/fs.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */