Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-14 17:14:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ocfs2: add ocfs2_acl_chmod

Browse Source 
This function is used to update acl xattrs during file mode changes.

Signed-off-by: Tiger Yang <tiger.yang@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
This commit is contained in:
Tiger Yang 2008-11-14 11:17:29 +08:00 committed by Mark Fasheh
parent 23fc2702be
commit 060bc66dd5
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fs/ocfs2/acl.c
View File

@ -245,6 +245,33 @@ int ocfs2_check_acl(struct inode *inode, int mask)
return -EAGAIN; return -EAGAIN;
} }
int ocfs2_acl_chmod(struct inode *inode)
{
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
struct posix_acl *acl, *clone;
int ret;
if (S_ISLNK(inode->i_mode))
return -EOPNOTSUPP;
if (!(osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL))
return 0;
acl = ocfs2_get_acl(inode, ACL_TYPE_ACCESS);
if (IS_ERR(acl) || !acl)
return PTR_ERR(acl);
clone = posix_acl_clone(acl, GFP_KERNEL);
posix_acl_release(acl);
if (!clone)
return -ENOMEM;
ret = posix_acl_chmod_masq(clone, inode->i_mode);
if (!ret)
ret = ocfs2_set_acl(NULL, inode, NULL, ACL_TYPE_ACCESS,
clone, NULL, NULL);
posix_acl_release(clone);
return ret;
}
static size_t ocfs2_xattr_list_acl_access(struct inode *inode, static size_t ocfs2_xattr_list_acl_access(struct inode *inode,
char *list, char *list,
size_t list_len, size_t list_len,

5
fs/ocfs2/acl.h
View File

@ -29,10 +29,15 @@ struct ocfs2_acl_entry {
#ifdef CONFIG_OCFS2_FS_POSIX_ACL #ifdef CONFIG_OCFS2_FS_POSIX_ACL
extern int ocfs2_check_acl(struct inode *, int); extern int ocfs2_check_acl(struct inode *, int);
extern int ocfs2_acl_chmod(struct inode *);
#else /* CONFIG_OCFS2_FS_POSIX_ACL*/ #else /* CONFIG_OCFS2_FS_POSIX_ACL*/
#define ocfs2_check_acl NULL #define ocfs2_check_acl NULL
static inline int ocfs2_acl_chmod(struct inode *inode)
{
return 0;
}
#endif /* CONFIG_OCFS2_FS_POSIX_ACL*/ #endif /* CONFIG_OCFS2_FS_POSIX_ACL*/

6
fs/ocfs2/file.c
View File

@ -990,6 +990,12 @@ bail_unlock_rw:
bail: bail:
brelse(bh); brelse(bh);
if (!status && attr->ia_valid & ATTR_MODE) {
status = ocfs2_acl_chmod(inode);
if (status < 0)
mlog_errno(status);
}
mlog_exit(status); mlog_exit(status);
return status; return status;
} }