From 6564cb34f77c261048076f6902fffc485ac8eae6 Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" Date: Tue, 16 Oct 2007 18:38:25 -0400 Subject: [PATCH] --- yaml --- r: 71079 b: refs/heads/master c: c1bddad9491b3941f7ae27eeee1e4f4822fb3169 h: refs/heads/master i: 71077: 495d036282ecc14d5fde0829dfd6f631914de312 71075: 1eb0c042240b668f2e7f1e900b549ea9675af07a 71071: af8ce6a9d7243d8c2e4a365b6c080dac4359f99a v: v3 --- [refs] | 2 +- trunk/fs/ext4/inode.c | 6 ++++-- trunk/include/linux/ext4_fs.h | 14 +++++++------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index ebf22dad7035..fbb5aa868abd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 717d50e4971b81b96c0199c91cdf0039a8cb181a +refs/heads/master: c1bddad9491b3941f7ae27eeee1e4f4822fb3169 diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index 1685f6a87789..89dd87634a2f 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/fs/ext4/inode.c @@ -3233,12 +3233,14 @@ int ext4_mark_inode_dirty(handle_t *handle, struct inode *inode) iloc, handle); if (ret) { EXT4_I(inode)->i_state |= EXT4_STATE_NO_EXPAND; - if (mnt_count != sbi->s_es->s_mnt_count) { + if (mnt_count != + le16_to_cpu(sbi->s_es->s_mnt_count)) { ext4_warning(inode->i_sb, __FUNCTION__, "Unable to expand inode %lu. Delete" " some EAs or run e2fsck.", inode->i_ino); - mnt_count = sbi->s_es->s_mnt_count; + mnt_count = + le16_to_cpu(sbi->s_es->s_mnt_count); } } } diff --git a/trunk/include/linux/ext4_fs.h b/trunk/include/linux/ext4_fs.h index b77b59fe7f56..722d4ef12bf3 100644 --- a/trunk/include/linux/ext4_fs.h +++ b/trunk/include/linux/ext4_fs.h @@ -574,13 +574,13 @@ struct ext4_super_block { /*150*/ __le32 s_blocks_count_hi; /* Blocks count */ __le32 s_r_blocks_count_hi; /* Reserved blocks count */ __le32 s_free_blocks_count_hi; /* Free blocks count */ - __u16 s_min_extra_isize; /* All inodes have at least # bytes */ - __u16 s_want_extra_isize; /* New inodes should reserve # bytes */ - __u32 s_flags; /* Miscellaneous flags */ - __u16 s_raid_stride; /* RAID stride */ - __u16 s_mmp_interval; /* # seconds to wait in MMP checking */ - __u64 s_mmp_block; /* Block for multi-mount protection */ - __u32 s_raid_stripe_width; /* blocks on all data disks (N*stride)*/ + __le16 s_min_extra_isize; /* All inodes have at least # bytes */ + __le16 s_want_extra_isize; /* New inodes should reserve # bytes */ + __le32 s_flags; /* Miscellaneous flags */ + __le16 s_raid_stride; /* RAID stride */ + __le16 s_mmp_interval; /* # seconds to wait in MMP checking */ + __le64 s_mmp_block; /* Block for multi-mount protection */ + __le32 s_raid_stripe_width; /* blocks on all data disks (N*stride)*/ __u32 s_reserved[163]; /* Padding to the end of the block */ };