Merge airlied/drm-next into drm-intel-next-queued

[linux-2.6-microblaze.git] / fs / afs / security.c

diff --git a/fs/afs/security.c b/fs/afs/security.c
index ecb86a6..faca662 100644 (file)
--- a/fs/afs/security.c
+++ b/fs/afs/security.c
@@ -327,12 +327,11 @@ int afs_permission(struct inode *inode, int mask)
                        if (!(access & AFS_ACE_LOOKUP))
                                goto permission_denied;
                } else if (mask & MAY_READ) {
-                       if (!(access & AFS_ACE_READ))
+                       if (!(access & AFS_ACE_LOOKUP))
                                goto permission_denied;
                } else if (mask & MAY_WRITE) {
                        if (!(access & (AFS_ACE_DELETE | /* rmdir, unlink, rename from */
-                                       AFS_ACE_INSERT | /* create, mkdir, symlink, rename to */
-                                       AFS_ACE_WRITE))) /* chmod */
+                                       AFS_ACE_INSERT))) /* create, mkdir, symlink, rename to */
                                goto permission_denied;
                } else {
                        BUG();