diff --git a/[refs] b/[refs] index f7cf13aa7194..77a62c1c7eb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1448c721e4fa2faf742029a0403b4b787fccb7fa +refs/heads/master: 8fd90c8d1dacb5ff0f372217c97f57a9e61559cd diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 0b3138de2a3b..2a4574f48001 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -257,7 +257,7 @@ static int acl_permission_check(struct inode *inode, int mask) /** * generic_permission - check for access rights on a Posix-like filesystem * @inode: inode to check access rights for - * @mask: right to check for (%MAY_READ, %MAY_WRITE, %MAY_EXEC) + * @mask: right to check for (%MAY_READ, %MAY_WRITE, %MAY_EXEC, ...) * * Used to check for read/write/execute permissions on a file. * We use "fsuid" for this, letting us set arbitrary permissions @@ -331,7 +331,7 @@ static inline int do_inode_permission(struct inode *inode, int mask) /** * inode_permission - check for access rights to a given inode * @inode: inode to check permission on - * @mask: right to check for (%MAY_READ, %MAY_WRITE, %MAY_EXEC) + * @mask: right to check for (%MAY_READ, %MAY_WRITE, %MAY_EXEC, ...) * * Used to check for read/write/execute permissions on an inode. * We use "fsuid" for this, letting us set arbitrary permissions