diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2009-06-13 10:09:41 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2009-06-13 10:09:41 -0400 |
| commit | 7f4520cc6242780ce720aa440ad4b391f998b558 (patch) | |
| tree | c8f1d99e019f2e29a967851031f4a60bf7ab1467 /fs/ext4 | |
| parent | 748de6736c1e482e111f9d1b5a5d5b1787600cad (diff) | |
| download | linux-3.10-7f4520cc6242780ce720aa440ad4b391f998b558.tar.gz linux-3.10-7f4520cc6242780ce720aa440ad4b391f998b558.tar.bz2 linux-3.10-7f4520cc6242780ce720aa440ad4b391f998b558.zip | |
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: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/ext4.h | 2 | ||||
| -rw-r--r-- | fs/ext4/inode.c | 2 | ||||
| -rw-r--r-- | fs/ext4/super.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 276a26f117e..569f527080b 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -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; diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 2418ad36eab..f8325a2bc89 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -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)); diff --git a/fs/ext4/super.c b/fs/ext4/super.c index e8f0b2af460..4c364ae7aeb 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -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), |