[Ocfs2-commits] manish commits r980 - trunk/src

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-06-02 18:42:03 -0500 (Wed, 02 Jun 2004)
New Revision: 980

Modified:
   trunk/src/inode.c
   trunk/src/namei.c
Log:
2.6-style i_version handling is fine for 2.4 as well. From Christoph Hellwig.


Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c	2004-06-02 23:39:13 UTC (rev 979)
+++ trunk/src/inode.c	2004-06-02 23:42:03 UTC (rev 980)
@@ -375,10 +375,7 @@
 		goto bail;
 	}
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	inode->i_version = 1;
-#endif
-
 	inode->i_rdev = MKDEV (fe->dev_major, fe->dev_minor);
 	inode->i_mode = mode;
 	inode->i_uid = fe->uid;

Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c	2004-06-02 23:39:13 UTC (rev 979)
+++ trunk/src/namei.c	2004-06-02 23:42:03 UTC (rev 980)
@@ -1132,11 +1132,7 @@
 		OCFS_BH_GET_DATA_WRITE(new_de_bh); /* write */
 		new_de->inode = le64_to_cpu(GET_INODE_FEOFF(old_inode));
 		new_de->file_type = old_de->file_type;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 		new_dir->i_version++;
-#else
-		new_dir->i_version = ++event;
-#endif
 		OCFS_BH_PUT_DATA(new_de_bh);
 		status = ocfs_journal_dirty(handle, new_de_bh);
 		if (status < 0) {
@@ -1554,11 +1550,7 @@
 			buf = NULL;
 
 			dir->i_mtime = dir->i_ctime = CURRENT_TIME;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 			dir->i_version++;
-#else
-			dir->i_version = ++event;
-#endif
 			status = ocfs_journal_dirty(handle, bh);
 			retval = 0;
 			goto bail;
@@ -1611,11 +1603,7 @@
 			else
 				de->inode = 0;
 			OCFS_BH_PUT_DATA(bh);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 			dir->i_version++;
-#else
-			dir->i_version = ++event;
-#endif
 			status = ocfs_journal_dirty(handle, bh);
 			goto bail;
 		}