aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext2/acl.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext2/acl.c')
-rw-r--r--fs/ext2/acl.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c
index 6af2f413029..35acc43b897 100644
--- a/fs/ext2/acl.c
+++ b/fs/ext2/acl.c
@@ -4,6 +4,7 @@
4 * Copyright (C) 2001-2003 Andreas Gruenbacher, <agruen@suse.de> 4 * Copyright (C) 2001-2003 Andreas Gruenbacher, <agruen@suse.de>
5 */ 5 */
6 6
7#include <linux/capability.h>
7#include <linux/init.h> 8#include <linux/init.h>
8#include <linux/sched.h> 9#include <linux/sched.h>
9#include <linux/slab.h> 10#include <linux/slab.h>
@@ -149,7 +150,7 @@ ext2_iset_acl(struct inode *inode, struct posix_acl **i_acl,
149} 150}
150 151
151/* 152/*
152 * inode->i_sem: don't care 153 * inode->i_mutex: don't care
153 */ 154 */
154static struct posix_acl * 155static struct posix_acl *
155ext2_get_acl(struct inode *inode, int type) 156ext2_get_acl(struct inode *inode, int type)
@@ -211,7 +212,7 @@ ext2_get_acl(struct inode *inode, int type)
211} 212}
212 213
213/* 214/*
214 * inode->i_sem: down 215 * inode->i_mutex: down
215 */ 216 */
216static int 217static int
217ext2_set_acl(struct inode *inode, int type, struct posix_acl *acl) 218ext2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
@@ -301,8 +302,8 @@ ext2_permission(struct inode *inode, int mask, struct nameidata *nd)
301/* 302/*
302 * Initialize the ACLs of a new inode. Called from ext2_new_inode. 303 * Initialize the ACLs of a new inode. Called from ext2_new_inode.
303 * 304 *
304 * dir->i_sem: down 305 * dir->i_mutex: down
305 * inode->i_sem: up (access to inode is still exclusive) 306 * inode->i_mutex: up (access to inode is still exclusive)
306 */ 307 */
307int 308int
308ext2_init_acl(struct inode *inode, struct inode *dir) 309ext2_init_acl(struct inode *inode, struct inode *dir)
@@ -361,7 +362,7 @@ cleanup:
361 * for directories) are added. There are no more bits available in the 362 * for directories) are added. There are no more bits available in the
362 * file mode. 363 * file mode.
363 * 364 *
364 * inode->i_sem: down 365 * inode->i_mutex: down
365 */ 366 */
366int 367int
367ext2_acl_chmod(struct inode *inode) 368ext2_acl_chmod(struct inode *inode)