Changeset 8842

Timestamp:

05/25/11 16:55:16 (2 years ago)

Author:

mtmoore

Message:

update configure checks and kernel code for 2.6.38

Location:

branches/Orange-Branch

Files:

• configure (modified) (2 diffs)
• maint/config/kernel.m4 (modified) (2 diffs)
• pvfs2-config.h.in (modified) (5 diffs)
• src/kernel/linux-2.6/acl.c (modified) (3 diffs)
• src/kernel/linux-2.6/dcache.c (modified) (6 diffs)
• src/kernel/linux-2.6/namei.c (modified) (2 diffs)
• src/kernel/linux-2.6/pvfs2-kernel.h (modified) (1 diff)

branches/Orange-Branch/configure

@@ -7177 +7177 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+                        tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for four-param generic_permission" >&5
+$as_echo_n "checking for four-param generic_permission... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #define __KERNEL__
+                #include <linux/fs.h>
+                struct inode *f;
+
+int
+main ()
+{
+
+                generic_permission(f, 0, 0, NULL);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_FOUR_PARAM_GENERIC_PERMISSION 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for generic_getxattr api in kernel" >&5
 $as_echo_n "checking for generic_getxattr api in kernel... " >&6; }
@@ -8721 +8755 @@
         CFLAGS=$tmp_cflags
 
-
+                        tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for three-param dentry_operations.d_hash" >&5
+$as_echo_n "checking for three-param dentry_operations.d_hash... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #define __KERNEL__
+                #include <linux/fs.h>
+                #include <linux/dcache.h>
+                static struct dentry_operations d;
+                static int d_hash_t(const struct dentry *d,
+                                    const struct inode *i,
+                                    struct qstr * q)
+                { return 0; }
+
+int
+main ()
+{
+
+                d.d_hash = d_hash_t;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_THREE_PARAM_D_HASH 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        CFLAGS=$tmp_cflags
+
+
+                                tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for seven-param dentry_operations.d_compare" >&5
+$as_echo_n "checking for seven-param dentry_operations.d_compare... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #define __KERNEL__
+                #include <linux/fs.h>
+                #include <linux/dcache.h>
+                static struct dentry_operations d;
+                static int d_compare_t(const struct dentry *d1,
+                                       const struct inode *i1,
+                                       const struct dentry *d2,
+                                       const struct inode *i2,
+                                       unsigned int len,
+                                       const char *str,
+                                       const struct qstr *qstr)
+                { return 0; }
+
+int
+main ()
+{
+
+                d.d_compare = d_compare_t;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_SEVEN_PARAM_D_COMPARE 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        CFLAGS=$tmp_cflags
+
+
+                        tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for constified dentry_operations.d_delete" >&5
+$as_echo_n "checking for constified dentry_operations.d_delete... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #define __KERNEL__
+                #include <linux/fs.h>
+                #include <linux/dcache.h>
+                static struct dentry_operations d;
+                static int d_delete_t(const struct dentry *d)
+                { return 0; }
+
+int
+main ()
+{
+
+                d.d_delete = d_delete_t;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_D_DELETE_CONST 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        CFLAGS=$tmp_cflags
+
+                        tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dentry.d_count atomic_t type" >&5
+$as_echo_n "checking for dentry.d_count atomic_t type... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #define __KERNEL__
+                #include <linux/fs.h>
+                #include <linux/dcache.h>
+                struct dentry d;
+                atomic_t x;
+
+int
+main ()
+{
+
+                x = d.d_count;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_DENTRY_D_COUNT_ATOMIC 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        CFLAGS=$tmp_cflags
+
+                                tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for three-param inode_operations permission" >&5
+$as_echo_n "checking for three-param inode_operations permission... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #define __KERNEL__
+                #include <linux/fs.h>
+                struct inode_operations i;
+                int p(struct inode *i, int mode, unsigned int flags)
+                { return 0; }
+
+int
+main ()
+{
+
+            i.permission = p;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_THREE_PARAM_PERMISSION_WITH_FLAG 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        CFLAGS=$tmp_cflags
+
+                        tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for three-param acl_check of generic_permission" >&5
+$as_echo_n "checking for three-param acl_check of generic_permission... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #define __KERNEL__
+                #include <linux/fs.h>
+                struct inode *i;
+                int p(struct inode *i, int mode, unsigned int flags)
+                { return 0; }
+
+int
+main ()
+{
+
+            generic_permission(i, 0, 0, p);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_THREE_PARAM_ACL_CHECK 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        CFLAGS=$tmp_cflags
 
 

branches/Orange-Branch/maint/config/kernel.m4

@@ -710 +710 @@
         )
 
+        dnl generic_permission in 2.6.38 and newer has a four parameter 
+        dnl signature
+        tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        AC_MSG_CHECKING(for four-param generic_permission)
+        AC_TRY_COMPILE([
+                #define __KERNEL__
+                #include <linux/fs.h>
+                struct inode *f;
+        ], 
+        [ 
+                generic_permission(f, 0, 0, NULL);
+        ],
+        AC_MSG_RESULT(yes)
+        AC_DEFINE(HAVE_FOUR_PARAM_GENERIC_PERMISSION, 1, [Define if generic_permission takes four parameters]),
+        AC_MSG_RESULT(no)
+        )
+
         AC_MSG_CHECKING(for generic_getxattr api in kernel)
         dnl if this test passes, the kernel does not have it
@@ -1475 +1493 @@
         CFLAGS=$tmp_cflags
 
-
+        dnl dentry operations struct d_hash function has a different signature
+        dnl in 2.6.38 and newer, second param is an inode
+        tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        AC_MSG_CHECKING(for three-param dentry_operations.d_hash)
+        AC_TRY_COMPILE([
+                #define __KERNEL__
+                #include <linux/fs.h>
+                #include <linux/dcache.h>
+                static struct dentry_operations d;
+                static int d_hash_t(const struct dentry *d, 
+                                    const struct inode *i, 
+                                    struct qstr * q)
+                { return 0; }
+        ], 
+        [ 
+                d.d_hash = d_hash_t;
+        ],
+        AC_MSG_RESULT(yes)
+        AC_DEFINE(HAVE_THREE_PARAM_D_HASH, 1, [Define if d_hash member of dentry_operations has three params, the second inode paramsbeing the difference]),
+        AC_MSG_RESULT(no)
+        )
+        CFLAGS=$tmp_cflags
+
+
+        dnl dentry operations struct d_compare function has a different 
+        dnl signature in 2.6.38 and newer, split out dentry/inodes, string and
+        dnl qstr params
+        tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        AC_MSG_CHECKING(for seven-param dentry_operations.d_compare)
+        AC_TRY_COMPILE([
+                #define __KERNEL__
+                #include <linux/fs.h>
+                #include <linux/dcache.h>
+                static struct dentry_operations d;
+                static int d_compare_t(const struct dentry *d1, 
+                                       const struct inode *i1,
+                                       const struct dentry *d2, 
+                                       const struct inode *i2, 
+                                       unsigned int len, 
+                                       const char *str, 
+                                       const struct qstr *qstr)
+                { return 0; }
+        ], 
+        [ 
+                d.d_compare = d_compare_t;
+        ],
+        AC_MSG_RESULT(yes)
+        AC_DEFINE(HAVE_SEVEN_PARAM_D_COMPARE, 1, [Define if d_compare member of dentry_operations has seven params]),
+        AC_MSG_RESULT(no)
+        )
+        CFLAGS=$tmp_cflags
+
+
+        dnl dentry operations struct d_delete argumentis constified in  
+        dnl 2.6.38 and newer
+        tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        AC_MSG_CHECKING(for constified dentry_operations.d_delete)
+        AC_TRY_COMPILE([
+                #define __KERNEL__
+                #include <linux/fs.h>
+                #include <linux/dcache.h>
+                static struct dentry_operations d;
+                static int d_delete_t(const struct dentry *d)
+                { return 0; }
+        ], 
+        [ 
+                d.d_delete = d_delete_t;
+        ],
+        AC_MSG_RESULT(yes)
+        AC_DEFINE(HAVE_D_DELETE_CONST, 1, [Define if d_delete member of dentry_operations has a const dentry param]),
+        AC_MSG_RESULT(no)
+        )
+        CFLAGS=$tmp_cflags
+
+        dnl dentry member d_count is no longer atomic and has it's own spinlock
+        dnl in 2.6.38 and newer
+        tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        AC_MSG_CHECKING(for dentry.d_count atomic_t type)
+        AC_TRY_COMPILE([
+                #define __KERNEL__
+                #include <linux/fs.h>
+                #include <linux/dcache.h>
+                struct dentry d;
+                atomic_t x;
+        ], 
+        [ 
+                x = d.d_count;
+        ],
+        AC_MSG_RESULT(yes)
+        AC_DEFINE(HAVE_DENTRY_D_COUNT_ATOMIC, 1, [Define if d_count member of dentry is of type atomic_t]),
+        AC_MSG_RESULT(no)
+        )
+        CFLAGS=$tmp_cflags
+
+        dnl permission function pointer in the inode_operations struct now
+        dnl takes three params with the third being an unsigned int (circa
+        dnl 2.6.38
+        tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        AC_MSG_CHECKING(for three-param inode_operations permission)
+        AC_TRY_COMPILE([
+                #define __KERNEL__
+                #include <linux/fs.h>
+                struct inode_operations i;
+                int p(struct inode *i, int mode, unsigned int flags)
+                { return 0; }
+        ], 
+        [ 
+            i.permission = p;
+        ],
+        AC_MSG_RESULT(yes)
+        AC_DEFINE(HAVE_THREE_PARAM_PERMISSION_WITH_FLAG, 1, [Define if permission function pointer of inode_operations struct has three parameters and the third parameter is for flags (unsigned int)]),
+        AC_MSG_RESULT(no)
+        )
+        CFLAGS=$tmp_cflags
+
+        dnl the acl_check parameter of the generic_permission function has a
+        dnl third parameter circa 2.6.38
+        tmp_cflags=$CFLAGS
+        CFLAGS="$CFLAGS -Werror"
+        AC_MSG_CHECKING(for three-param acl_check of generic_permission)
+        AC_TRY_COMPILE([
+                #define __KERNEL__
+                #include <linux/fs.h>
+                struct inode *i;
+                int p(struct inode *i, int mode, unsigned int flags)
+                { return 0; }
+        ], 
+        [ 
+            generic_permission(i, 0, 0, p);
+        ],
+        AC_MSG_RESULT(yes)
+        AC_DEFINE(HAVE_THREE_PARAM_ACL_CHECK, 1, [Define if acl_check param of generic_permission function has three parameters]),
+        AC_MSG_RESULT(no)
+        )
+        CFLAGS=$tmp_cflags
 
 

branches/Orange-Branch/pvfs2-config.h.in

@@ -74 +74 @@
 #undef HAVE_DB_GET_PAGESIZE
 
+/* Define if d_count member of dentry is of type atomic_t */
+#undef HAVE_DENTRY_D_COUNT_ATOMIC
+
 /* Define if super_operations statfs has dentry argument */
 #undef HAVE_DENTRY_STATFS_SOP
@@ -82 +85 @@
 /* Define if dcache.h contains d_alloc_annon */
 #undef HAVE_D_ALLOC_ANON
+
+/* Define if d_delete member of dentry_operations has a const dentry param */
+#undef HAVE_D_DELETE_CONST
 
 /* Define if export_operations has an encode_fh member */
@@ -108 +114 @@
 #undef HAVE_FIND_INODE_HANDLE_SUPER_OPERATIONS
 
+/* Define if generic_permission takes four parameters */
+#undef HAVE_FOUR_PARAM_GENERIC_PERMISSION
+
 /* Define to 1 if you have the `fsetxattr' function. */
 #undef HAVE_FSETXATTR
@@ -345 +354 @@
 #undef HAVE_SETXATTR_CONST_ARG
 
+/* Define if d_compare member of dentry_operations has seven params */
+#undef HAVE_SEVEN_PARAM_D_COMPARE
+
 /* Define if SLAB_KERNEL is defined in kernel */
 #undef HAVE_SLAB_KERNEL
@@ -418 +430 @@
 /* Define if TAU library is used */
 #undef HAVE_TAU
+
+/* Define if acl_check param of generic_permission function has three
+   parameters */
+#undef HAVE_THREE_PARAM_ACL_CHECK
+
+/* Define if d_hash member of dentry_operations has three params, the second
+   inode paramsbeing the difference */
+#undef HAVE_THREE_PARAM_D_HASH
+
+/* Define if permission function pointer of inode_operations struct has three
+   parameters and the third parameter is for flags (unsigned int) */
+#undef HAVE_THREE_PARAM_PERMISSION_WITH_FLAG
 
 /* Define if kernel stddef has true/false enum */

branches/Orange-Branch/src/kernel/linux-2.6/acl.c

@@ -712 +712 @@
 }
 
-static int pvfs2_check_acl(struct inode *inode, int mask)
+static int pvfs2_check_acl(struct inode *inode, int mask
+#ifdef HAVE_THREE_PARAM_ACL_CHECK
+                           , unsigned int flags
+#endif /* HAVE_THREE_PARAM_ACL_CHECK */
+                          )
 {
     struct posix_acl *acl = NULL;
@@ -743 +747 @@
 int pvfs2_permission(struct inode *inode, int mask)
 #else
-int pvfs2_permission(struct inode *inode, int mask, struct nameidata *nd)
-#endif
+int pvfs2_permission(struct inode *inode, int mask, 
+#ifdef HAVE_THREE_PARAM_PERMISSION_WITH_FLAG
+unsigned int flags)
+#else
+struct nameidata *nd)
+#endif /* HAVE_THREE_PARAM_PERMISSION_WITH_FLAG */
+#endif /* HAVE_TWO_PARAM_PERMISSION */
 {
 #ifdef HAVE_CURRENT_FSUID
@@ -755 +764 @@
     int ret;
 
-    ret = generic_permission(inode, mask, pvfs2_check_acl);
+    ret = generic_permission(inode, mask, 
+#ifdef HAVE_FOUR_PARAM_GENERIC_PERMISSION
+                             0,
+#endif /* HAVE_FOUR_PARAM_GENERIC_PERMISSION */ 
+                             pvfs2_check_acl);
     if (ret != 0)
     {

branches/Orange-Branch/src/kernel/linux-2.6/dcache.c

@@ -152 +152 @@
 }
 
-static int pvfs2_d_delete (struct dentry * dentry)
+static int pvfs2_d_delete (
+#ifdef HAVE_D_DELETE_CONST
+const
+#endif /* HAVE_D_DELETE_CONST */
+struct dentry * dentry
+)
 {
     gossip_debug(GOSSIP_DCACHE_DEBUG,
@@ -208 +213 @@
 */
 static int pvfs2_d_hash(
+#ifdef HAVE_THREE_PARAM_D_HASH
+    const struct dentry *parent,
+    const struct inode *inode,
+    struct qstr *hash
+#else
     struct dentry *parent,
-    struct qstr *hash)
+    struct qstr *hash
+#endif /* HAVE_THREE_PARAM_D_HASH */
+                        )
 {
 /*     gossip_debug(GOSSIP_DCACHE_DEBUG, "pvfs2: pvfs2_d_hash called " */
@@ -217 +229 @@
 }
 
+#ifdef HAVE_SEVEN_PARAM_D_COMPARE
+static int pvfs2_d_compare(
+                            const struct dentry *parent, 
+                            const struct inode * pinode,
+                            const struct dentry *dentry, 
+                            const struct inode *inode,
+                            unsigned int len, 
+                            const char *str, 
+                            const struct qstr *name)
+{
+    int i = 0;
+    gossip_debug(GOSSIP_DCACHE_DEBUG, "pvfs2_d_compare: "
+                 "called on parent %p\n  (name1: %s| name2: %s)\n", 
+                 parent, str, name->name);
+
+    if( len != name->len ) 
+        return 1;
+  
+    for( i=0; i < len; i++ )
+    {
+        if( str[i] != name->name[i] )
+            return 1;
+    }
+    return 0;
+}
+#else
 static int pvfs2_d_compare(
     struct dentry *parent,
@@ -230 +268 @@
              (memcmp(d_name->name, name->name, d_name->len) == 0));
 }
+#endif /* HAVE_SEVEN_PARAM_D_COMPARE */
+
 
 /** PVFS2 implementation of VFS dentry operations */
@@ -247 +287 @@
 static void __attribute__ ((unused)) print_dentry(struct dentry *entry, int ret)
 {
+  unsigned int local_count = 0;
   if(!entry)
   {
@@ -265 +306 @@
   }
 
+#ifdef HAVE_DENTRY_D_COUNT_ATOMIC
+  local_count = atomic_read(&entry->d_count);
+#else
+  spin_lock(&entry->d_lock);
+  local_count = entry->d_count;
+  spin_unlock(&entry->d_lock);
+#endif /* HAVE_DENTRY_D_COUNT_ATOMIC */
+
   printk("--- dentry %p: d_count: %d, name: %s, parent: %p, parent name: %s, ret: %d\n",
         entry,
-        atomic_read(&entry->d_count),
+        local_count,
         entry->d_name.name,
         entry->d_parent,

branches/Orange-Branch/src/kernel/linux-2.6/namei.c

@@ -395 +395 @@
 {
     int ret = -EINVAL, are_directories = 0;
+    unsigned int local_count = 0;
     pvfs2_inode_t *pvfs2_old_parent_inode = PVFS2_I(old_dir);
     pvfs2_inode_t *pvfs2_new_parent_inode = PVFS2_I(new_dir);
@@ -400 +401 @@
     struct super_block *sb = NULL;
 
+
+#ifdef HAVE_DENTRY_D_COUNT_ATOMIC
+    local_count = atomic_read(&new_dentry->d_count);
+#else
+    spin_lock( &new_dentry->d_lock );
+    local_count = new_dentry->d_count;
+    spin_unlock( &new_dentry->d_lock );
+#endif /* HAVE_DENTRY_D_COUNT_ATOMIC */
     gossip_debug(GOSSIP_NAME_DEBUG, "pvfs2_rename: called (%s/%s => %s/%s) ct=%d\n",
                 old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
                 new_dentry->d_parent->d_name.name, new_dentry->d_name.name,
-                atomic_read(&new_dentry->d_count));
+                local_count);
 
     are_directories = S_ISDIR(old_dentry->d_inode->i_mode);

branches/Orange-Branch/src/kernel/linux-2.6/pvfs2-kernel.h

@@ -866 +866 @@
 int pvfs2_permission(struct inode *, int);
 #else
-int pvfs2_permission(struct inode *inode, 
-                                         int mask, struct nameidata *nd);
+int pvfs2_permission(struct inode *, int mask, 
+#ifdef HAVE_THREE_PARAM_PERMISSION_WITH_FLAG
+                     unsigned int flags);
+#else
+                     struct nameidata *nd);
+#endif /* HAVE_THREE_PARAM_PERMISSION_WITH_FLAG */
 #endif