From: Cordenner jean noel Subject: Re: [PATCH 1/2] i_version update - vfs part Date: Thu, 25 Oct 2007 19:04:30 +0200 Message-ID: <1193331870.5487.31.camel@frecb002711.frec.bull.fr> References: <1191598088.24615.45.camel@frecb002711.frec.bull.fr> Reply-To: jean-noel.cordenner@bull.net Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Cc: linux-kernel@vger.kernel.org To: linux-ext4@vger.kernel.org Return-path: Received: from ecfrec.frec.bull.fr ([129.183.4.8]:50203 "EHLO ecfrec.frec.bull.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753207AbXJYRJM (ORCPT ); Thu, 25 Oct 2007 13:09:12 -0400 In-Reply-To: <1191598088.24615.45.camel@frecb002711.frec.bull.fr> Sender: linux-ext4-owner@vger.kernel.org List-Id: linux-ext4.vger.kernel.org Hi, This is an update of the previous patches on the ext4 git tree, the 2 coming patches applies at the end of the current ext4-patch-queue, and replaces the inode-version related patches: 64-bit-i_version.patch i_version_hi.patch ext4_i_version_hi_2.patch i_version_update_ext4.patch The first part deals with the vfs part. The i_version field of the inode is changed to be a 64-bit counter that is set on every inode creation and that is incremented every time the inode data is modified (similarly to the "ctime" time-stamp). The aim is to fulfill a NFSv4 requirement for rfc3530. This first part concerns the vfs, it converts the 32-bit i_version in the generic inode to a 64-bit, a flag is added in the super block in order to check if the feature is enabled and the i_version is incremented in the vfs. Signed-off-by: Mingming Cao Signed-off-by: Jean Noel Cordenner Signed-off-by: Kalpak Shah --- fs/inode.c | 22 ++++++++++++++++++++++ include/linux/fs.h | 5 ++++- 2 files changed, 26 insertions(+), 1 deletion(-) Index: linux-2.6.23-ext4-1/include/linux/fs.h =================================================================== --- linux-2.6.23-ext4-1.orig/include/linux/fs.h 2007-10-25 16:25:23.000000000 +0200 +++ linux-2.6.23-ext4-1/include/linux/fs.h 2007-10-25 16:25:53.000000000 +0200 @@ -123,6 +123,7 @@ #define MS_SLAVE (1<<19) /* change to slave */ #define MS_SHARED (1<<20) /* change to shared */ #define MS_RELATIME (1<<21) /* Update atime relative to mtime/ctime. */ +#define MS_I_VERSION (1<<22) /* Update inode I_version field */ #define MS_ACTIVE (1<<30) #define MS_NOUSER (1<<31) @@ -172,6 +173,7 @@ ((inode)->i_flags & (S_SYNC|S_DIRSYNC))) #define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK) #define IS_NOATIME(inode) __IS_FLG(inode, MS_RDONLY|MS_NOATIME) +#define IS_I_VERSION(inode) __IS_FLG(inode, MS_I_VERSION) #define IS_NOQUOTA(inode) ((inode)->i_flags & S_NOQUOTA) #define IS_APPEND(inode) ((inode)->i_flags & S_APPEND) @@ -541,7 +543,7 @@ uid_t i_uid; gid_t i_gid; dev_t i_rdev; - unsigned long i_version; + u64 i_version; loff_t i_size; #ifdef __NEED_I_SIZE_ORDERED seqcount_t i_size_seqcount; @@ -1284,6 +1286,7 @@ mark_inode_dirty(inode); } +extern void inode_inc_iversion(struct inode *inode); extern void touch_atime(struct vfsmount *mnt, struct dentry *dentry); static inline void file_accessed(struct file *file) { Index: linux-2.6.23-ext4-1/fs/inode.c =================================================================== --- linux-2.6.23-ext4-1.orig/fs/inode.c 2007-10-25 16:15:52.000000000 +0200 +++ linux-2.6.23-ext4-1/fs/inode.c 2007-10-25 16:25:53.000000000 +0200 @@ -1216,6 +1216,24 @@ EXPORT_SYMBOL(touch_atime); /** + * inode_inc_iversion - increments i_version + * @inode: inode that need to be updated + * + * Every time the inode is modified, the i_version field + * will be incremented. + * The filesystem has to be mounted with i_version flag + * + */ + +void inode_inc_iversion(struct inode *inode) +{ + spin_lock(&inode->i_lock); + inode->i_version++; + spin_unlock(&inode->i_lock); +} + +/** * file_update_time - update mtime and ctime time * @file: file accessed * @@ -1249,6 +1267,11 @@ sync_it = 1; } + if (IS_I_VERSION(inode)) { + inode_inc_iversion(inode); + sync_it = 1; + } + if (sync_it) mark_inode_dirty_sync(inode); }