aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext3/inode.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-07-08 11:52:42 -0400
committerTony Luck <tony.luck@intel.com>2005-07-08 11:52:42 -0400
commit88c3cdfdde3cf87e1831265ea4246430bef34fc9 (patch)
treecaea510ffb2f81a5ea13b00ecb8a4146ad462048 /fs/ext3/inode.c
parent2b2c3750330325ae5071582b5c4dbdf1c8bc1e51 (diff)
parenta92b7b80579fe68fe229892815c750f6652eb6a9 (diff)
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'fs/ext3/inode.c')
-rw-r--r--fs/ext3/inode.c2
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,
2663 } else for (block = 0; block < EXT3_N_BLOCKS; block++) 2663 } else for (block = 0; block < EXT3_N_BLOCKS; block++)
2664 raw_inode->i_block[block] = ei->i_data[block]; 2664 raw_inode->i_block[block] = ei->i_data[block];
2665 2665
2666 if (EXT3_INODE_SIZE(inode->i_sb) > EXT3_GOOD_OLD_INODE_SIZE) 2666 if (ei->i_extra_isize)
2667 raw_inode->i_extra_isize = cpu_to_le16(ei->i_extra_isize); 2667 raw_inode->i_extra_isize = cpu_to_le16(ei->i_extra_isize);
2668 2668
2669 BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata"); 2669 BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata");