Commit 77516dc9 authored by Sage Weil's avatar Sage Weil Committed by Linus Torvalds

ceph: fix missing dput in ceph_set_acl

Add matching dput() for d_find_alias().  Move d_find_alias() down a bit
at Julia's suggestion.

[ Introduced by commit 72466d0b: "ceph: fix posix ACL hooks" ]
Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Reported-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarSage Weil <sage@inktank.com>
Reviewed-by: default avatarIlya Dryomov <ilya.dryomov@inktank.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e7651b81
......@@ -107,7 +107,7 @@ int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type)
char *value = NULL;
struct iattr newattrs;
umode_t new_mode = inode->i_mode, old_mode = inode->i_mode;
struct dentry *dentry = d_find_alias(inode);
struct dentry *dentry;
if (acl) {
ret = posix_acl_valid(acl);
......@@ -151,12 +151,13 @@ int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type)
goto out_free;
}
dentry = d_find_alias(inode);
if (new_mode != old_mode) {
newattrs.ia_mode = new_mode;
newattrs.ia_valid = ATTR_MODE;
ret = ceph_setattr(dentry, &newattrs);
if (ret)
goto out_free;
goto out_dput;
}
if (value)
......@@ -170,11 +171,13 @@ int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type)
newattrs.ia_valid = ATTR_MODE;
ceph_setattr(dentry, &newattrs);
}
goto out_free;
goto out_dput;
}
ceph_set_cached_acl(inode, type, acl);
out_dput:
dput(dentry);
out_free:
kfree(value);
out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment