aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/xattr_acl.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/reiserfs/xattr_acl.c')
-rw-r--r--fs/reiserfs/xattr_acl.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c
index a47ac9aac8b2..43de3ba83332 100644
--- a/fs/reiserfs/xattr_acl.c
+++ b/fs/reiserfs/xattr_acl.c
@@ -1,3 +1,4 @@
1#include <linux/capability.h>
1#include <linux/fs.h> 2#include <linux/fs.h>
2#include <linux/posix_acl.h> 3#include <linux/posix_acl.h>
3#include <linux/reiserfs_fs.h> 4#include <linux/reiserfs_fs.h>
@@ -174,7 +175,7 @@ static void *posix_acl_to_disk(const struct posix_acl *acl, size_t * size)
174/* 175/*
175 * Inode operation get_posix_acl(). 176 * Inode operation get_posix_acl().
176 * 177 *
177 * inode->i_sem: down 178 * inode->i_mutex: down
178 * BKL held [before 2.5.x] 179 * BKL held [before 2.5.x]
179 */ 180 */
180struct posix_acl *reiserfs_get_acl(struct inode *inode, int type) 181struct posix_acl *reiserfs_get_acl(struct inode *inode, int type)
@@ -237,7 +238,7 @@ struct posix_acl *reiserfs_get_acl(struct inode *inode, int type)
237/* 238/*
238 * Inode operation set_posix_acl(). 239 * Inode operation set_posix_acl().
239 * 240 *
240 * inode->i_sem: down 241 * inode->i_mutex: down
241 * BKL held [before 2.5.x] 242 * BKL held [before 2.5.x]
242 */ 243 */
243static int 244static int
@@ -312,7 +313,7 @@ reiserfs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
312 return error; 313 return error;
313} 314}
314 315
315/* dir->i_sem: down, 316/* dir->i_mutex: locked,
316 * inode is new and not released into the wild yet */ 317 * inode is new and not released into the wild yet */
317int 318int
318reiserfs_inherit_default_acl(struct inode *dir, struct dentry *dentry, 319reiserfs_inherit_default_acl(struct inode *dir, struct dentry *dentry,