diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-23 18:56:36 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-08-01 02:10:06 -0400 |
commit | d6952123b53cc8b334df69bba2cd0063b0d88f68 (patch) | |
tree | b1ccaa7e3d65dbf4af093202044da65bc4deb34e /fs/btrfs/acl.c | |
parent | d3fb612076eebec6f67257db0c7a9666ac7e5892 (diff) |
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/btrfs/acl.c')
-rw-r--r-- | fs/btrfs/acl.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index 59086142c14d..4cc5c0164ed6 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c | |||
@@ -111,7 +111,6 @@ static int btrfs_set_acl(struct btrfs_trans_handle *trans, | |||
111 | int ret, size = 0; | 111 | int ret, size = 0; |
112 | const char *name; | 112 | const char *name; |
113 | char *value = NULL; | 113 | char *value = NULL; |
114 | mode_t mode; | ||
115 | 114 | ||
116 | if (acl) { | 115 | if (acl) { |
117 | ret = posix_acl_valid(acl); | 116 | ret = posix_acl_valid(acl); |
@@ -122,13 +121,11 @@ static int btrfs_set_acl(struct btrfs_trans_handle *trans, | |||
122 | 121 | ||
123 | switch (type) { | 122 | switch (type) { |
124 | case ACL_TYPE_ACCESS: | 123 | case ACL_TYPE_ACCESS: |
125 | mode = inode->i_mode; | ||
126 | name = POSIX_ACL_XATTR_ACCESS; | 124 | name = POSIX_ACL_XATTR_ACCESS; |
127 | if (acl) { | 125 | if (acl) { |
128 | ret = posix_acl_equiv_mode(acl, &mode); | 126 | ret = posix_acl_equiv_mode(acl, &inode->i_mode); |
129 | if (ret < 0) | 127 | if (ret < 0) |
130 | return ret; | 128 | return ret; |
131 | inode->i_mode = mode; | ||
132 | } | 129 | } |
133 | ret = 0; | 130 | ret = 0; |
134 | break; | 131 | break; |