[Ocfs2-commits] rev 742 - in trunk/src: . inc

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-01 17:50:58 -0600 (Mon, 01 Mar 2004)
New Revision: 742

Modified:
   trunk/src/dcache.c
   trunk/src/inc/ocfs.h
   trunk/src/namei.c
Log:
* add a patch by Rusty Lynch <rusty at linux.co.intel.com>:
The following is some misc prototype fixes that still need to make
it into the tree.



Modified: trunk/src/dcache.c
===================================================================
--- trunk/src/dcache.c	2004-03-01 23:41:32 UTC (rev 741)
+++ trunk/src/dcache.c	2004-03-01 23:50:58 UTC (rev 742)
@@ -35,7 +35,11 @@
  * ocfs_dentry_revalidate()
  *
  */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+int ocfs_dentry_revalidate (struct dentry *dentry, struct nameidata *nd)
+#else
 int ocfs_dentry_revalidate (struct dentry *dentry, int flags)
+#endif
 {
 	int tmpstat, ret = 0;    /* if all else fails, just return false */
 	ocfs_file_entry *fe = NULL;
@@ -46,7 +50,9 @@
         struct qstr q;
 	struct buffer_head *fe_bh = NULL;
 	int needs_trunc;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+	int flags = nd->flags;
+#else
 	ocfs_find_inode_args args;
 #endif
 

Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h	2004-03-01 23:41:32 UTC (rev 741)
+++ trunk/src/inc/ocfs.h	2004-03-01 23:50:58 UTC (rev 742)
@@ -92,6 +92,7 @@
 #include <linux/blkdev.h>
 #include <linux/in.h>
 #include <linux/buffer_head.h>
+#include <linux/namei.h>
 #endif
 #include <linux/smp_lock.h>
 

Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c	2004-03-01 23:41:32 UTC (rev 741)
+++ trunk/src/namei.c	2004-03-01 23:50:58 UTC (rev 742)
@@ -58,7 +58,11 @@
  * ocfs_lookup()
  *
  */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+struct dentry *ocfs_lookup (struct inode *dir, struct dentry *dentry, struct nameidata *nd)
+#else
 struct dentry *ocfs_lookup (struct inode *dir, struct dentry *dentry)
+#endif
 {
 	int status;
 	ocfs_find_inode_args args;
@@ -542,7 +546,11 @@
  * ocfs_create()
  *
  */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+int ocfs_create (struct inode *dir, struct dentry *dentry, int mode, struct nameidata *nd)
+#else
 int ocfs_create (struct inode *dir, struct dentry *dentry, int mode)
+#endif
 {
 	int ret;