aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/configure.ac2
-rw-r--r--kernel/dir.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/kernel/configure.ac b/kernel/configure.ac
index 30e4a10..7e7cf2b 100644
--- a/kernel/configure.ac
+++ b/kernel/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(fuse-kernel, 2.3.1-pre1)
+AC_INIT(fuse-kernel, 2.4.0-pre0)
AC_CONFIG_HEADERS([config.h])
AC_PROG_INSTALL
diff --git a/kernel/dir.c b/kernel/dir.c
index 26d2dfc..a7a6945 100644
--- a/kernel/dir.c
+++ b/kernel/dir.c
@@ -552,7 +552,9 @@ static int fuse_permission(struct inode *inode, int mask, struct nameidata *nd)
return -EACCES;
err = 0;
- if (nd->flags & LOOKUP_ACCESS)
+ if (nd &&
+ ((nd->flags & LOOKUP_ACCESS) ||
+ ((nd->flags & LOOKUP_OPEN) && mode != 0)))
err = fuse_access(inode, mask);
}
return err;