diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-24 00:56:36 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-08-01 08:10:06 +0200 |
| commit | d6952123b53cc8b334df69bba2cd0063b0d88f68 (patch) | |
| tree | b1ccaa7e3d65dbf4af093202044da65bc4deb34e /fs/generic_acl.c | |
| parent | switch posix_acl_create() to umode_t * (diff) | |
| download | linux-d6952123b53cc8b334df69bba2cd0063b0d88f68.tar.xz linux-d6952123b53cc8b334df69bba2cd0063b0d88f68.zip | |
switch posix_acl_equiv_mode() to umode_t *
... so that &inode->i_mode could be passed to it
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/generic_acl.c')
| -rw-r--r-- | fs/generic_acl.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/generic_acl.c b/fs/generic_acl.c index 2dd434d6ff29..d0dddaceac59 100644 --- a/fs/generic_acl.c +++ b/fs/generic_acl.c @@ -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); |