1 files changed, 3 insertions, 3 deletions

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 409ce6a7cca4..8605155db171 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -508,7 +508,7 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry)
                 /* Set nlink to zero so the inode can be cleared, if
                    the inode does have more links this will be
                    discovered at the next lookup/getattr */
-                inode->i_nlink = 0;
+                clear_nlink(inode);
                 fuse_invalidate_attr(inode);
                 fuse_invalidate_attr(dir);
                 fuse_invalidate_entry_cache(entry);
@@ -534,7 +534,7 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry)
         err = req->out.h.error;
         fuse_put_request(fc, req);
         if (!err) {
-                entry->d_inode->i_nlink = 0;
+                clear_nlink(entry->d_inode);
                 fuse_invalidate_attr(dir);
                 fuse_invalidate_entry_cache(entry);
         } else if (err == -EINTR)
@@ -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;
         }