diff --git a/[refs] b/[refs] index 43f2559da7fc..faa88f305149 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fddd9cf82c9f9617d134ae878a8f6b116ebbd43d +refs/heads/master: 1a823ac9ff09cbdf39201df37b7ede1f9395de83 diff --git a/trunk/fs/fuse/dir.c b/trunk/fs/fuse/dir.c index 7fb514b6d852..c4807b3fc8a3 100644 --- a/trunk/fs/fuse/dir.c +++ b/trunk/fs/fuse/dir.c @@ -906,7 +906,7 @@ static int fuse_permission(struct inode *inode, int mask, struct nameidata *nd) } if (fc->flags & FUSE_DEFAULT_PERMISSIONS) { - int err = generic_permission(inode, mask, NULL); + err = generic_permission(inode, mask, NULL); /* If permission is denied, try to refresh file attributes. This is also needed, because the root