[Ocfs2-commits] jlbec commits r1011 - branches/format-changes/src

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-06-04 18:23:29 -0500 (Fri, 04 Jun 2004)
New Revision: 1011

Modified:
   branches/format-changes/src/inode.c
   branches/format-changes/src/namei.c
Log:

o Merged revision 980 from trunk.
  (2.6-style i_version handling is fine for 2.4 as well.  From
   Christoph Hellwig.)



Modified: branches/format-changes/src/inode.c
===================================================================
--- branches/format-changes/src/inode.c	2004-06-04 23:19:04 UTC (rev 1010)
+++ branches/format-changes/src/inode.c	2004-06-04 23:23:29 UTC (rev 1011)
@@ -395,9 +395,7 @@
 		goto bail;
 	}
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	inode->i_version = 1;
-#endif
 	inode->i_generation = le32_to_cpu(fe->i_generation);
 	inode->i_rdev = ocfs_decode_dev(le64_to_cpu(fe->u.i_rdev));
 	inode->i_mode = fe->i_mode;

Modified: branches/format-changes/src/namei.c
===================================================================
--- branches/format-changes/src/namei.c	2004-06-04 23:19:04 UTC (rev 1010)
+++ branches/format-changes/src/namei.c	2004-06-04 23:23:29 UTC (rev 1011)
@@ -1133,11 +1133,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) {
@@ -1555,11 +1551,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;
@@ -1612,11 +1604,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;
 		}