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

Commit 7f4520cc authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: change s_mount_opt to be an unsigned int 



We can only fit 32 options in s_mount_opt because an unsigned long is
32-bits on a x86 machine.  So use an unsigned int to save space on
64-bit platforms.

Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 748de673

fs/ext4/ext4.h

+1 −1
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@ struct ext4_sb_info { 
	struct buffer_head * s_sbh;	/* Buffer containing the super block */

	struct ext4_super_block *s_es;	/* Pointer to the super block in the buffer */

	struct buffer_head **s_group_desc;

	unsigned long  s_mount_opt;

	unsigned int s_mount_opt;

	ext4_fsblk_t s_sb_block;

	uid_t s_resuid;

	gid_t s_resgid;

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ int ext4_forget(handle_t *handle, int is_metadata, struct inode *inode, 
	BUFFER_TRACE(bh, "enter");



	jbd_debug(4, "forgetting bh %p: is_metadata = %d, mode %o, "

		  "data mode %lx\n",

		  "data mode %x\n",

		  bh, is_metadata, inode->i_mode,

		  test_opt(inode->i_sb, DATA_FLAGS));

fs/ext4/super.c

+1 −1
Original line number Diff line number Diff line
@@ -1655,7 +1655,7 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es, 
	ext4_commit_super(sb, 1);

	if (test_opt(sb, DEBUG))

		printk(KERN_INFO "[EXT4 FS bs=%lu, gc=%u, "

				"bpg=%lu, ipg=%lu, mo=%04lx]\n",

				"bpg=%lu, ipg=%lu, mo=%04x]\n",

			sb->s_blocksize,

			sbi->s_groups_count,

			EXT4_BLOCKS_PER_GROUP(sb),