Skip to content

Commit d695212

Browse files
author
Al Viro
committed
switch posix_acl_equiv_mode() to umode_t *
... so that &inode->i_mode could be passed to it Signed-off-by: Al Viro <[email protected]>
1 parent d3fb612 commit d695212

File tree

14 files changed

+15
-32
lines changed

14 files changed

+15
-32
lines changed

‎fs/9p/acl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name,
319319
case ACL_TYPE_ACCESS:
320320
name = POSIX_ACL_XATTR_ACCESS;
321321
if (acl) {
322-
mode_t mode = inode->i_mode;
322+
umode_t mode = inode->i_mode;
323323
retval = posix_acl_equiv_mode(acl, &mode);
324324
if (retval < 0)
325325
goto err_out;

‎fs/btrfs/acl.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ static int btrfs_set_acl(struct btrfs_trans_handle *trans,
111111
int ret, size = 0;
112112
const char *name;
113113
char *value = NULL;
114-
mode_t mode;
115114

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

123122
switch (type) {
124123
case ACL_TYPE_ACCESS:
125-
mode = inode->i_mode;
126124
name = POSIX_ACL_XATTR_ACCESS;
127125
if (acl) {
128-
ret = posix_acl_equiv_mode(acl, &mode);
126+
ret = posix_acl_equiv_mode(acl, &inode->i_mode);
129127
if (ret < 0)
130128
return ret;
131-
inode->i_mode = mode;
132129
}
133130
ret = 0;
134131
break;

‎fs/ext2/acl.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,10 @@ ext2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
194194
case ACL_TYPE_ACCESS:
195195
name_index = EXT2_XATTR_INDEX_POSIX_ACL_ACCESS;
196196
if (acl) {
197-
mode_t mode = inode->i_mode;
198-
error = posix_acl_equiv_mode(acl, &mode);
197+
error = posix_acl_equiv_mode(acl, &inode->i_mode);
199198
if (error < 0)
200199
return error;
201200
else {
202-
inode->i_mode = mode;
203201
inode->i_ctime = CURRENT_TIME_SEC;
204202
mark_inode_dirty(inode);
205203
if (error == 0)

‎fs/ext3/acl.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,10 @@ ext3_set_acl(handle_t *handle, struct inode *inode, int type,
199199
case ACL_TYPE_ACCESS:
200200
name_index = EXT3_XATTR_INDEX_POSIX_ACL_ACCESS;
201201
if (acl) {
202-
mode_t mode = inode->i_mode;
203-
error = posix_acl_equiv_mode(acl, &mode);
202+
error = posix_acl_equiv_mode(acl, &inode->i_mode);
204203
if (error < 0)
205204
return error;
206205
else {
207-
inode->i_mode = mode;
208206
inode->i_ctime = CURRENT_TIME_SEC;
209207
ext3_mark_inode_dirty(handle, inode);
210208
if (error == 0)

‎fs/ext4/acl.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,10 @@ ext4_set_acl(handle_t *handle, struct inode *inode, int type,
198198
case ACL_TYPE_ACCESS:
199199
name_index = EXT4_XATTR_INDEX_POSIX_ACL_ACCESS;
200200
if (acl) {
201-
mode_t mode = inode->i_mode;
202-
error = posix_acl_equiv_mode(acl, &mode);
201+
error = posix_acl_equiv_mode(acl, &inode->i_mode);
203202
if (error < 0)
204203
return error;
205204
else {
206-
inode->i_mode = mode;
207205
inode->i_ctime = ext4_current_time(inode);
208206
ext4_mark_inode_dirty(handle, inode);
209207
if (error == 0)

‎fs/generic_acl.c

+1-5
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,14 @@ generic_acl_set(struct dentry *dentry, const char *name, const void *value,
8282
return PTR_ERR(acl);
8383
}
8484
if (acl) {
85-
mode_t mode;
86-
8785
error = posix_acl_valid(acl);
8886
if (error)
8987
goto failed;
9088
switch (type) {
9189
case ACL_TYPE_ACCESS:
92-
mode = inode->i_mode;
93-
error = posix_acl_equiv_mode(acl, &mode);
90+
error = posix_acl_equiv_mode(acl, &inode->i_mode);
9491
if (error < 0)
9592
goto failed;
96-
inode->i_mode = mode;
9793
inode->i_ctime = CURRENT_TIME;
9894
if (error == 0) {
9995
posix_acl_release(acl);

‎fs/gfs2/acl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ static int gfs2_xattr_system_set(struct dentry *dentry, const char *name,
276276
goto out_release;
277277

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

282282
if (error <= 0) {

‎fs/jffs2/acl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
227227
case ACL_TYPE_ACCESS:
228228
xprefix = JFFS2_XPREFIX_ACL_ACCESS;
229229
if (acl) {
230-
mode_t mode = inode->i_mode;
230+
umode_t mode = inode->i_mode;
231231
rc = posix_acl_equiv_mode(acl, &mode);
232232
if (rc < 0)
233233
return rc;

‎fs/jfs/xattr.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -693,16 +693,14 @@ static int can_set_system_xattr(struct inode *inode, const char *name,
693693
return rc;
694694
}
695695
if (acl) {
696-
mode_t mode = inode->i_mode;
697-
rc = posix_acl_equiv_mode(acl, &mode);
696+
rc = posix_acl_equiv_mode(acl, &inode->i_mode);
698697
posix_acl_release(acl);
699698
if (rc < 0) {
700699
printk(KERN_ERR
701700
"posix_acl_equiv_mode returned %d\n",
702701
rc);
703702
return rc;
704703
}
705-
inode->i_mode = mode;
706704
mark_inode_dirty(inode);
707705
}
708706
/*

‎fs/ocfs2/acl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ static int ocfs2_set_acl(handle_t *handle,
247247
case ACL_TYPE_ACCESS:
248248
name_index = OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS;
249249
if (acl) {
250-
mode_t mode = inode->i_mode;
250+
umode_t mode = inode->i_mode;
251251
ret = posix_acl_equiv_mode(acl, &mode);
252252
if (ret < 0)
253253
return ret;

‎fs/posix_acl.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ posix_acl_valid(const struct posix_acl *acl)
149149
* file mode permission bits, or else 1. Returns -E... on error.
150150
*/
151151
int
152-
posix_acl_equiv_mode(const struct posix_acl *acl, mode_t *mode_p)
152+
posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
153153
{
154154
const struct posix_acl_entry *pa, *pe;
155-
mode_t mode = 0;
155+
umode_t mode = 0;
156156
int not_equiv = 0;
157157

158158
FOREACH_ACL_ENTRY(pa, acl, pe) {

‎fs/reiserfs/xattr_acl.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -272,12 +272,10 @@ reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode,
272272
case ACL_TYPE_ACCESS:
273273
name = POSIX_ACL_XATTR_ACCESS;
274274
if (acl) {
275-
mode_t mode = inode->i_mode;
276-
error = posix_acl_equiv_mode(acl, &mode);
275+
error = posix_acl_equiv_mode(acl, &inode->i_mode);
277276
if (error < 0)
278277
return error;
279278
else {
280-
inode->i_mode = mode;
281279
if (error == 0)
282280
acl = NULL;
283281
}

‎fs/xfs/linux-2.6/xfs_acl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ xfs_xattr_acl_set(struct dentry *dentry, const char *name,
381381
goto out_release;
382382

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

387387
if (error <= 0) {

‎include/linux/posix_acl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ extern struct posix_acl *posix_acl_alloc(int, gfp_t);
7676
extern int posix_acl_valid(const struct posix_acl *);
7777
extern int posix_acl_permission(struct inode *, const struct posix_acl *, int);
7878
extern struct posix_acl *posix_acl_from_mode(mode_t, gfp_t);
79-
extern int posix_acl_equiv_mode(const struct posix_acl *, mode_t *);
79+
extern int posix_acl_equiv_mode(const struct posix_acl *, umode_t *);
8080
extern int posix_acl_create(struct posix_acl **, gfp_t, umode_t *);
8181
extern int posix_acl_chmod(struct posix_acl **, gfp_t, mode_t);
8282

0 commit comments

Comments
 (0)