summaryrefslogtreecommitdiff
path: root/fs/ceph/acl.c
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2016-05-26 17:10:38 +0300
committerJan Kara <jack@suse.cz>2016-09-22 11:56:19 +0300
commitfd5472ed44683cf593322a2ef54b9a7675dc780a (patch)
tree24e1f8a7fa4a0ec32e88d8c3a28ab43bcd131b97 /fs/ceph/acl.c
parent69bca80744eef58fa155e8042996b968fec17b26 (diff)
downloadlinux-fd5472ed44683cf593322a2ef54b9a7675dc780a.tar.xz
ceph: Propagate dentry down to inode_change_ok()
To avoid clearing of capabilities or security related extended attributes too early, inode_change_ok() will need to take dentry instead of inode. ceph_setattr() has the dentry easily available but __ceph_setattr() is also called from ceph_set_acl() where dentry is not easily available. Luckily that call path does not need inode_change_ok() to be called anyway. So reorganize functions a bit so that inode_change_ok() is called only from paths where dentry is available. Reviewed-by: Christoph Hellwig <hch@lst.de> Acked-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ceph/acl.c')
-rw-r--r--fs/ceph/acl.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ceph/acl.c b/fs/ceph/acl.c
index d0b6b342dff9..987044bca1c2 100644
--- a/fs/ceph/acl.c
+++ b/fs/ceph/acl.c
@@ -125,6 +125,11 @@ int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type)
goto out_free;
}
+ if (ceph_snap(inode) != CEPH_NOSNAP) {
+ ret = -EROFS;
+ goto out_free;
+ }
+
if (new_mode != old_mode) {
newattrs.ia_mode = new_mode;
newattrs.ia_valid = ATTR_MODE;