Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 0b2db4f618cb..9989fdcf4d5a 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -2663,7 +2663,7 @@ static int ext3_do_update_inode(handle_t *handle,
         } else for (block = 0; block < EXT3_N_BLOCKS; block++)
                 raw_inode->i_block[block] = ei->i_data[block];
 
-        if (EXT3_INODE_SIZE(inode->i_sb) > EXT3_GOOD_OLD_INODE_SIZE)
+        if (ei->i_extra_isize)
                 raw_inode->i_extra_isize = cpu_to_le16(ei->i_extra_isize);
 
         BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata");