diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-01-31 12:58:16 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-26 02:46:06 -0500 |
commit | be308f07964a597ea1806a0c02477a383b92f53a (patch) | |
tree | 9dd3220096d6b399978fbe48267a20339778c4e0 /fs/9p/acl.c | |
parent | 0f235caeaed6bbde6d455e172a83fa693ca485a1 (diff) |
9p: switch v9fs_acl_chmod() from dentry to inode+fid
caller has both, might as well pass them explicitly.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/9p/acl.c')
-rw-r--r-- | fs/9p/acl.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/9p/acl.c b/fs/9p/acl.c index 506d8af26a1f..81ae143ff3f7 100644 --- a/fs/9p/acl.c +++ b/fs/9p/acl.c | |||
@@ -147,17 +147,13 @@ err_free_out: | |||
147 | return retval; | 147 | return retval; |
148 | } | 148 | } |
149 | 149 | ||
150 | int v9fs_acl_chmod(struct dentry *dentry) | 150 | int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid) |
151 | { | 151 | { |
152 | int retval = 0; | 152 | int retval = 0; |
153 | struct posix_acl *acl; | 153 | struct posix_acl *acl; |
154 | struct inode *inode = dentry->d_inode; | ||
155 | struct p9_fid *fid = v9fs_fid_lookup(dentry); | ||
156 | 154 | ||
157 | if (S_ISLNK(inode->i_mode)) | 155 | if (S_ISLNK(inode->i_mode)) |
158 | return -EOPNOTSUPP; | 156 | return -EOPNOTSUPP; |
159 | if (IS_ERR(fid)) | ||
160 | return PTR_ERR(fid); | ||
161 | acl = v9fs_get_cached_acl(inode, ACL_TYPE_ACCESS); | 157 | acl = v9fs_get_cached_acl(inode, ACL_TYPE_ACCESS); |
162 | if (acl) { | 158 | if (acl) { |
163 | retval = posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode); | 159 | retval = posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode); |