Skip to content

Commit

Permalink
switch posix_acl_equiv_mode() to umode_t *
Browse files Browse the repository at this point in the history 
... so that &inode->i_mode could be passed to it

Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
Al Viro committed Aug 1, 2011
1 parent d3fb612 commit d695212
Show file tree
Hide file tree
Showing 14 changed files with 15 additions and 32 deletions.
2 changes: 1 addition & 1 deletion fs/9p/acl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name,
case ACL_TYPE_ACCESS:
name = POSIX_ACL_XATTR_ACCESS;
if (acl) {
mode_t mode = inode->i_mode;
umode_t mode = inode->i_mode;
retval = posix_acl_equiv_mode(acl, &mode);
if (retval < 0)
goto err_out;
Expand Down
5 changes: 1 addition & 4 deletions fs/btrfs/acl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ static int btrfs_set_acl(struct btrfs_trans_handle *trans,
int ret, size = 0;
const char *name;
char *value = NULL;
mode_t mode;

if (acl) {
ret = posix_acl_valid(acl);
Expand All @@ -122,13 +121,11 @@ static int btrfs_set_acl(struct btrfs_trans_handle *trans,

switch (type) {
case ACL_TYPE_ACCESS:
mode = inode->i_mode;
name = POSIX_ACL_XATTR_ACCESS;
if (acl) {
ret = posix_acl_equiv_mode(acl, &mode);
ret = posix_acl_equiv_mode(acl, &inode->i_mode);
if (ret < 0)
return ret;
inode->i_mode = mode;
}
ret = 0;
break;
Expand Down
4 changes: 1 addition & 3 deletions fs/ext2/acl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,10 @@ ext2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
case ACL_TYPE_ACCESS:
name_index = EXT2_XATTR_INDEX_POSIX_ACL_ACCESS;
if (acl) {
mode_t mode = inode->i_mode;
error = posix_acl_equiv_mode(acl, &mode);
error = posix_acl_equiv_mode(acl, &inode->i_mode);
if (error < 0)
return error;
else {
inode->i_mode = mode;
inode->i_ctime = CURRENT_TIME_SEC;
mark_inode_dirty(inode);
if (error == 0)
Expand Down
4 changes: 1 addition & 3 deletions fs/ext3/acl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,10 @@ ext3_set_acl(handle_t *handle, struct inode *inode, int type,
case ACL_TYPE_ACCESS:
name_index = EXT3_XATTR_INDEX_POSIX_ACL_ACCESS;
if (acl) {
mode_t mode = inode->i_mode;
error = posix_acl_equiv_mode(acl, &mode);
error = posix_acl_equiv_mode(acl, &inode->i_mode);
if (error < 0)
return error;
else {
inode->i_mode = mode;
inode->i_ctime = CURRENT_TIME_SEC;
ext3_mark_inode_dirty(handle, inode);
if (error == 0)
Expand Down
4 changes: 1 addition & 3 deletions fs/ext4/acl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,10 @@ ext4_set_acl(handle_t *handle, struct inode *inode, int type,
case ACL_TYPE_ACCESS:
name_index = EXT4_XATTR_INDEX_POSIX_ACL_ACCESS;
if (acl) {
mode_t mode = inode->i_mode;
error = posix_acl_equiv_mode(acl, &mode);
error = posix_acl_equiv_mode(acl, &inode->i_mode);
if (error < 0)
return error;
else {
inode->i_mode = mode;
inode->i_ctime = ext4_current_time(inode);
ext4_mark_inode_dirty(handle, inode);
if (error == 0)
Expand Down
6 changes: 1 addition & 5 deletions fs/generic_acl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,14 @@ generic_acl_set(struct dentry *dentry, const char *name, const void *value,
return PTR_ERR(acl);
}
if (acl) {
mode_t mode;

error = posix_acl_valid(acl);
if (error)
goto failed;
switch (type) {
case ACL_TYPE_ACCESS:
mode = inode->i_mode;
error = posix_acl_equiv_mode(acl, &mode);
error = posix_acl_equiv_mode(acl, &inode->i_mode);
if (error < 0)
goto failed;
inode->i_mode = mode;
inode->i_ctime = CURRENT_TIME;
if (error == 0) {
posix_acl_release(acl);
Expand Down
2 changes: 1 addition & 1 deletion fs/gfs2/acl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ static int gfs2_xattr_system_set(struct dentry *dentry, const char *name,
goto out_release;

if (type == ACL_TYPE_ACCESS) {
mode_t mode = inode->i_mode;
umode_t mode = inode->i_mode;
error = posix_acl_equiv_mode(acl, &mode);

if (error <= 0) {
Expand Down
2 changes: 1 addition & 1 deletion fs/jffs2/acl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
case ACL_TYPE_ACCESS:
xprefix = JFFS2_XPREFIX_ACL_ACCESS;
if (acl) {
mode_t mode = inode->i_mode;
umode_t mode = inode->i_mode;
rc = posix_acl_equiv_mode(acl, &mode);
if (rc < 0)
return rc;
Expand Down
4 changes: 1 addition & 3 deletions fs/jfs/xattr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -693,16 +693,14 @@ static int can_set_system_xattr(struct inode *inode, const char *name,
return rc;
}
if (acl) {
mode_t mode = inode->i_mode;
rc = posix_acl_equiv_mode(acl, &mode);
rc = posix_acl_equiv_mode(acl, &inode->i_mode);
posix_acl_release(acl);
if (rc < 0) {
printk(KERN_ERR
"posix_acl_equiv_mode returned %d\n",
rc);
return rc;
}
inode->i_mode = mode;
mark_inode_dirty(inode);
}
/*
Expand Down
2 changes: 1 addition & 1 deletion fs/ocfs2/acl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ static int ocfs2_set_acl(handle_t *handle,
case ACL_TYPE_ACCESS:
name_index = OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS;
if (acl) {
mode_t mode = inode->i_mode;
umode_t mode = inode->i_mode;
ret = posix_acl_equiv_mode(acl, &mode);
if (ret < 0)
return ret;
Expand Down
4 changes: 2 additions & 2 deletions fs/posix_acl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@ posix_acl_valid(const struct posix_acl *acl)
* file mode permission bits, or else 1. Returns -E... on error.
*/
int
posix_acl_equiv_mode(const struct posix_acl *acl, mode_t *mode_p)
posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
{
const struct posix_acl_entry *pa, *pe;
mode_t mode = 0;
umode_t mode = 0;
int not_equiv = 0;

FOREACH_ACL_ENTRY(pa, acl, pe) {
Expand Down
4 changes: 1 addition & 3 deletions fs/reiserfs/xattr_acl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,12 +272,10 @@ reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode,
case ACL_TYPE_ACCESS:
name = POSIX_ACL_XATTR_ACCESS;
if (acl) {
mode_t mode = inode->i_mode;
error = posix_acl_equiv_mode(acl, &mode);
error = posix_acl_equiv_mode(acl, &inode->i_mode);
if (error < 0)
return error;
else {
inode->i_mode = mode;
if (error == 0)
acl = NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion fs/xfs/linux-2.6/xfs_acl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ xfs_xattr_acl_set(struct dentry *dentry, const char *name,
goto out_release;

if (type == ACL_TYPE_ACCESS) {
mode_t mode = inode->i_mode;
umode_t mode = inode->i_mode;
error = posix_acl_equiv_mode(acl, &mode);

if (error <= 0) {
Expand Down
2 changes: 1 addition & 1 deletion include/linux/posix_acl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ extern struct posix_acl *posix_acl_alloc(int, gfp_t);
extern int posix_acl_valid(const struct posix_acl *);
extern int posix_acl_permission(struct inode *, const struct posix_acl *, int);
extern struct posix_acl *posix_acl_from_mode(mode_t, gfp_t);
extern int posix_acl_equiv_mode(const struct posix_acl *, mode_t *);
extern int posix_acl_equiv_mode(const struct posix_acl *, umode_t *);
extern int posix_acl_create(struct posix_acl **, gfp_t, umode_t *);
extern int posix_acl_chmod(struct posix_acl **, gfp_t, mode_t);

Expand Down

0 comments on commit d695212

Please sign in to comment.