diff options
Diffstat (limited to 'fs/ext3/acl.c')
-rw-r--r-- | fs/ext3/acl.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c index 3ac38266fc9e..47a9da2dfb4f 100644 --- a/fs/ext3/acl.c +++ b/fs/ext3/acl.c | |||
@@ -7,6 +7,7 @@ | |||
7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
8 | #include <linux/sched.h> | 8 | #include <linux/sched.h> |
9 | #include <linux/slab.h> | 9 | #include <linux/slab.h> |
10 | #include <linux/capability.h> | ||
10 | #include <linux/fs.h> | 11 | #include <linux/fs.h> |
11 | #include <linux/ext3_jbd.h> | 12 | #include <linux/ext3_jbd.h> |
12 | #include <linux/ext3_fs.h> | 13 | #include <linux/ext3_fs.h> |
@@ -152,7 +153,7 @@ ext3_iset_acl(struct inode *inode, struct posix_acl **i_acl, | |||
152 | /* | 153 | /* |
153 | * Inode operation get_posix_acl(). | 154 | * Inode operation get_posix_acl(). |
154 | * | 155 | * |
155 | * inode->i_sem: don't care | 156 | * inode->i_mutex: don't care |
156 | */ | 157 | */ |
157 | static struct posix_acl * | 158 | static struct posix_acl * |
158 | ext3_get_acl(struct inode *inode, int type) | 159 | ext3_get_acl(struct inode *inode, int type) |
@@ -216,7 +217,7 @@ ext3_get_acl(struct inode *inode, int type) | |||
216 | /* | 217 | /* |
217 | * Set the access or default ACL of an inode. | 218 | * Set the access or default ACL of an inode. |
218 | * | 219 | * |
219 | * inode->i_sem: down unless called from ext3_new_inode | 220 | * inode->i_mutex: down unless called from ext3_new_inode |
220 | */ | 221 | */ |
221 | static int | 222 | static int |
222 | ext3_set_acl(handle_t *handle, struct inode *inode, int type, | 223 | ext3_set_acl(handle_t *handle, struct inode *inode, int type, |
@@ -306,8 +307,8 @@ ext3_permission(struct inode *inode, int mask, struct nameidata *nd) | |||
306 | /* | 307 | /* |
307 | * Initialize the ACLs of a new inode. Called from ext3_new_inode. | 308 | * Initialize the ACLs of a new inode. Called from ext3_new_inode. |
308 | * | 309 | * |
309 | * dir->i_sem: down | 310 | * dir->i_mutex: down |
310 | * inode->i_sem: up (access to inode is still exclusive) | 311 | * inode->i_mutex: up (access to inode is still exclusive) |
311 | */ | 312 | */ |
312 | int | 313 | int |
313 | ext3_init_acl(handle_t *handle, struct inode *inode, struct inode *dir) | 314 | ext3_init_acl(handle_t *handle, struct inode *inode, struct inode *dir) |
@@ -368,7 +369,7 @@ cleanup: | |||
368 | * for directories) are added. There are no more bits available in the | 369 | * for directories) are added. There are no more bits available in the |
369 | * file mode. | 370 | * file mode. |
370 | * | 371 | * |
371 | * inode->i_sem: down | 372 | * inode->i_mutex: down |
372 | */ | 373 | */ |
373 | int | 374 | int |
374 | ext3_acl_chmod(struct inode *inode) | 375 | ext3_acl_chmod(struct inode *inode) |