1 Index: linux-2.6.18-128.1.6/fs/ext4/inode.c
2 ===================================================================
3 --- linux-2.6.18-128.1.6.orig/fs/ext4/inode.c
4 +++ linux-2.6.18-128.1.6/fs/ext4/inode.c
5 @@ -2850,11 +2850,11 @@ struct inode *ext4_iget(struct super_blo
6 EXT4_INODE_GET_XTIME(i_atime, inode, raw_inode);
7 EXT4_EINODE_GET_XTIME(i_crtime, ei, raw_inode);
9 - inode->i_version = le32_to_cpu(raw_inode->i_disk_version);
10 + ei->i_fs_version = le32_to_cpu(raw_inode->i_disk_version);
11 if (EXT4_INODE_SIZE(inode->i_sb) > EXT4_GOOD_OLD_INODE_SIZE) {
12 if (EXT4_FITS_IN_INODE(raw_inode, ei, i_version_hi))
14 - (__u64)(le32_to_cpu(raw_inode->i_version_hi)) << 32;
15 + ei->i_fs_version |= (__u64)(le32_to_cpu(raw_inode->i_version_hi))
19 if (S_ISREG(inode->i_mode)) {
20 @@ -3043,16 +3043,11 @@ static int ext4_do_update_inode(handle_t
21 } else for (block = 0; block < EXT4_N_BLOCKS; block++)
22 raw_inode->i_block[block] = ei->i_data[block];
24 - raw_inode->i_disk_version = cpu_to_le32(inode->i_version);
25 + raw_inode->i_disk_version = cpu_to_le32(ei->i_fs_version);
26 if (ei->i_extra_isize) {
27 if (EXT4_FITS_IN_INODE(raw_inode, ei, i_version_hi))
28 - /* in RHEL5 i_version is an unsigned long */
29 -#if BITS_PER_LONG == 64
30 - raw_inode->i_version_hi =
31 - cpu_to_le32(inode->i_version >> 32);
33 - raw_inode->i_version_hi = 0;
35 + raw_inode->i_version_hi = cpu_to_le32(ei->i_fs_version
37 raw_inode->i_extra_isize = cpu_to_le16(ei->i_extra_isize);
40 Index: linux-2.6.18-128.1.6/fs/ext4/ext4_i.h
41 ===================================================================
42 --- linux-2.6.18-128.1.6.orig/fs/ext4/ext4_i.h
43 +++ linux-2.6.18-128.1.6/fs/ext4/ext4_i.h
45 #include <linux/seqlock.h>
46 #include <linux/mutex.h>
48 +#define HAVE_DISK_INODE_VERSION
50 /* data type for block offset of block group */
51 typedef int ext4_grpblk_t;
53 @@ -164,6 +166,8 @@ struct ext4_inode_info {
54 spinlock_t i_prealloc_lock;
62 Index: linux-2.6.18-128.1.6/fs/ext4/ialloc.c
63 ===================================================================
64 --- linux-2.6.18-128.1.6.orig/fs/ext4/ialloc.c
65 +++ linux-2.6.18-128.1.6/fs/ext4/ialloc.c
66 @@ -878,6 +878,7 @@ got:
68 ei->i_block_alloc_info = NULL;
69 ei->i_block_group = group;
70 + ei->i_fs_version = 0;
72 ext4_set_inode_flags(inode);
73 if (IS_DIRSYNC(inode))