diff options
| author | Jan Kara <jack@suse.cz> | 2016-05-26 16:10:38 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2016-09-22 10:56:19 +0200 |
| commit | fd5472ed44683cf593322a2ef54b9a7675dc780a (patch) | |
| tree | 24e1f8a7fa4a0ec32e88d8c3a28ab43bcd131b97 /fs/ceph/acl.c | |
| parent | 69bca80744eef58fa155e8042996b968fec17b26 (diff) | |
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.c | 5 |
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; |