3 files changed, 4 insertions, 1 deletions

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 1e2006caf1..4fc557c40c 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -212,6 +212,7 @@ void fuse_put_request(struct fuse_conn *fc, struct fuse_req *req)
  * Called with fc->lock, unlocks it
  */
 static void request_end(struct fuse_conn *fc, struct fuse_req *req)
+        __releases(fc->lock)
 {
         void (*end) (struct fuse_conn *, struct fuse_req *) = req->end;
         req->end = NULL;
@@ -640,6 +641,7 @@ static void request_wait(struct fuse_conn *fc)
  */
 static int fuse_read_interrupt(struct fuse_conn *fc, struct fuse_req *req,
                                const struct iovec *iov, unsigned long nr_segs)
+        __releases(fc->lock)
 {
         struct fuse_copy_state cs;
         struct fuse_in_header ih;
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 409ce6a7cc..f85b2a282f 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -776,7 +776,7 @@ static int fuse_permission(struct inode *inode, int mask, struct nameidata *nd)
                 if ((mask & MAY_EXEC) && !S_ISDIR(mode) && !(mode & S_IXUGO))
                         return -EACCES;
 
-                if (nd && (nd->flags & LOOKUP_ACCESS))
+                if (nd && (nd->flags & (LOOKUP_ACCESS | LOOKUP_CHDIR)))
                         return fuse_access(inode, mask);
                 return 0;
         }
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index cb7cadb0b7..7d0a9aee01 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -251,6 +251,7 @@ static int fuse_statfs(struct dentry *dentry, struct kstatfs *buf)
         memset(&outarg, 0, sizeof(outarg));
         req->in.numargs = 0;
         req->in.h.opcode = FUSE_STATFS;
+        req->in.h.nodeid = get_node_id(dentry->d_inode);
         req->out.numargs = 1;
         req->out.args[0].size =
                 fc->minor < 4 ? FUSE_COMPAT_STATFS_SIZE : sizeof(outarg);