])
#
+# 3.6 dentry_open uses struct path as first argument
+# see kernel commit 765927b2
+#
+AC_DEFUN([LC_DENTRY_OPEN_USE_PATH],
+[AC_MSG_CHECKING([if dentry_open uses struct path as first argument])
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_LINUX_TRY_COMPILE([
+ #include <linux/fs.h>
+ #include <linux/path.h>
+],[
+ struct path path;
+ dentry_open(&path, 0, NULL);
+],[
+ AC_DEFINE(HAVE_DENTRY_OPEN_USE_PATH, 1,
+ [dentry_open uses struct path as first argument])
+ AC_MSG_RESULT([yes])
+],[
+ AC_MSG_RESULT([no])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+])
+
+#
# LC_PROG_LINUX
#
# Lustre linux kernel checks
# 3.6
LC_HAVE_DENTRY_D_ALIAS_HLIST
+ LC_DENTRY_OPEN_USE_PATH
#
if test x$enable_server = xyes ; then
#define ll_blkdev_put(a, b) blkdev_put(a)
#endif
-#ifdef HAVE_DENTRY_OPEN_4ARGS
-#define ll_dentry_open(a, b, c, d) dentry_open(a, b, c, d)
+static inline struct file *ll_dentry_open(struct dentry *dentry,
+ struct vfsmount *mnt, int flags,
+ const struct cred *cred)
+{
+#ifdef HAVE_DENTRY_OPEN_USE_PATH
+ struct path path = { .mnt = mnt, .dentry = dentry };
+ return dentry_open(&path, flags, cred);
+#elif defined HAVE_DENTRY_OPEN_4ARGS
+ return dentry_open(dentry, mnt, flags, cred);
#else
-#define ll_dentry_open(a, b, c, d) dentry_open(a, b, c)
+ return dentry_open(dentry, mnt, flags);
#endif
+}
#ifdef HAVE_SECURITY_PLUG
#define ll_vfs_symlink(dir, dentry, mnt, path, mode) \