From 483c21bab632e47cd7ca9103f263258220d54982 Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@kernel.org>
Date: Sun, 23 Oct 2011 23:13:33 +0530
Subject: [PATCH] --- yaml --- r: 270021 b: refs/heads/master c:
 948409c74d217f6cf054b8c927765a1c3fe16b53 h: refs/heads/master i:   270019:
 4768aa07f1ddd50bf2ad32c92441ed5a9732f247 v: v3

---
 [refs]           | 2 +-
 trunk/fs/namei.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 41b8ebe30943..1cb948e3ee29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d124b60a838141bb9cac1b6567e9ca4539d1fff0
+refs/heads/master: 948409c74d217f6cf054b8c927765a1c3fe16b53
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 276cd30ab8f8..9061157e39d6 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -221,7 +221,7 @@ static int check_acl(struct inode *inode, int mask)
 }
 
 /*
- * This does basic POSIX ACL permission checking
+ * This does the basic permission checking
  */
 static int acl_permission_check(struct inode *inode, int mask)
 {
@@ -271,7 +271,7 @@ int generic_permission(struct inode *inode, int mask)
 	int ret;
 
 	/*
-	 * Do the basic POSIX ACL permission checks.
+	 * Do the basic permission checks.
 	 */
 	ret = acl_permission_check(inode, mask);
 	if (ret != -EACCES)
@@ -335,6 +335,8 @@ static inline int do_inode_permission(struct inode *inode, int mask)
  * We use "fsuid" for this, letting us set arbitrary permissions
  * for filesystem access without changing the "normal" uids which
  * are used for other things.
+ *
+ * When checking for MAY_APPEND, MAY_WRITE must also be set in @mask.
  */
 int inode_permission(struct inode *inode, int mask)
 {