Skip to contentSkip to conversation

i_version update for ext4: VFS layer

RFC PATCH In review Cordenner jean noel 1 participant 1 message Jan 23, 2007

Subsystems (2)
VFS exec and binfmt
lore
Share & tools
lore

Cordenner jean noel

author
#0 lore raw

RFC PATCH 1/3 i_version update for ext4: VFS layer

This part of the patch concerns the update of the i_version in the VFS layer.

Signed-off-by Jean Noel Cordenner <[email protected]>
fs/attr.c 2007-01-22 17:03:41.000000000 +0100 renamed from fs/attr.c 2006-11-29 22:57:37.000000000 +0100 +1 -0
Index: linux-2.6.20-rc5/fs/attr.c
===================================================================
@@ -113,6 +113,7 @@
        now = current_fs_time(inode->i_sb);
 
        attr->ia_ctime = now;
+       inode->i_version++;
        if (!(ia_valid & ATTR_ATIME_SET))
                attr->ia_atime = now;
        if (!(ia_valid & ATTR_MTIME_SET))
fs/bad_inode.c 2007-01-22 17:04:58.000000000 +0100 renamed from fs/bad_inode.c 2007-01-19 16:59:14.000000000 +0100 +1 -0
Index: linux-2.6.20-rc5/fs/bad_inode.c
===================================================================
@@ -343,6 +343,7 @@
        inode->i_mode = S_IFREG;
        inode->i_atime = inode->i_mtime = inode->i_ctime =
                current_fs_time(inode->i_sb);
+       inode->i_version++;
        inode->i_op = &bad_inode_ops;
        inode->i_fop = &bad_file_ops;
 }
fs/binfmt_misc.c 2007-01-22 17:05:54.000000000 +0100 renamed from fs/binfmt_misc.c 2007-01-19 16:59:14.000000000 +0100 +1 -0
Index: linux-2.6.20-rc5/fs/binfmt_misc.c
===================================================================
@@ -508,6 +508,7 @@
                inode->i_blocks = 0;
                inode->i_atime = inode->i_mtime = inode->i_ctime =
                        current_fs_time(inode->i_sb);
+               inode->i_version = 1;
        }
        return inode;
 }
fs/inode.c 2007-01-22 17:18:28.000000000 +0100 renamed from fs/inode.c 2007-01-19 16:59:15.000000000 +0100 +4 -11
Index: linux-2.6.20-rc5/fs/inode.c
===================================================================
@@ -1225,18 +1225,11 @@
                return;
 
        now = current_fs_time(inode->i_sb);
-       if (!timespec_equal(&inode->i_mtime, &now)) {
-               inode->i_mtime = now;
-               sync_it = 1;
-       }
-
-       if (!timespec_equal(&inode->i_ctime, &now)) {
-               inode->i_ctime = now;
-               sync_it = 1;
-       }
+       inode->i_mtime = now;
+       inode->i_ctime = now;
+       inode->i_version++;
 
-       if (sync_it)
-               mark_inode_dirty_sync(inode);
+       mark_inode_dirty_sync(inode);
 }
 
 EXPORT_SYMBOL(file_update_time);
fs/libfs.c 2007-01-22 17:23:13.000000000 +0100 renamed from fs/libfs.c 2007-01-19 16:59:15.000000000 +0100 +8 -0
Index: linux-2.6.20-rc5/fs/libfs.c
===================================================================
@@ -220,6 +220,7 @@
        root->i_mode = S_IFDIR | S_IRUSR | S_IWUSR;
        root->i_uid = root->i_gid = 0;
        root->i_atime = root->i_mtime = root->i_ctime = CURRENT_TIME;
+       root->i_version = 1;
        dentry = d_alloc(NULL, &d_name);
        if (!dentry) {
                iput(root);

@@ -243,6 +244,8 @@
        struct inode *inode = old_dentry->d_inode;
 
        inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
+       inode->i_version++;
+       dir->i_version++;
        inc_nlink(inode);
        atomic_inc(&inode->i_count);
        dget(dentry);

@@ -275,6 +278,8 @@
        struct inode *inode = dentry->d_inode;
 
        inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
+       inode->i_version++;
+       dir->i_version++;
        drop_nlink(inode);
        dput(dentry);
        return 0;

@@ -312,6 +317,8 @@
        old_dir->i_ctime = old_dir->i_mtime = new_dir->i_ctime =
                new_dir->i_mtime = inode->i_ctime = CURRENT_TIME;
 
+       old_dir->i_version++;
+       new_dir->i_version++;
        return 0;
 }
 

@@ -377,6 +384,7 @@
        inode->i_uid = inode->i_gid = 0;
        inode->i_blocks = 0;
        inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+       inode->i_version = 1;
        inode->i_op = &simple_dir_inode_operations;
        inode->i_fop = &simple_dir_operations;
        inode->i_nlink = 2;

@@ -398,6 +406,7 @@
                inode->i_uid = inode->i_gid = 0;
                inode->i_blocks = 0;
                inode->i_atime = inode->i_mtime = inode->i_ctime =

CURRENT_TIME;

+               inode->i_version = 1;
                inode->i_fop = files->ops;
                inode->i_ino = i;
                d_add(dentry, inode);
fs/pipe.c 2007-01-22 17:24:46.000000000 +0100 renamed from fs/pipe.c 2007-01-19 16:59:15.000000000 +0100 +1 -0
Index: linux-2.6.20-rc5/fs/pipe.c
===================================================================
@@ -871,6 +871,7 @@
        inode->i_uid = current->fsuid;
        inode->i_gid = current->fsgid;
        inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+       inode->i_version = 1;
 
        return inode;