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>

diff --git a/fs/ceph/acl.c b/fs/ceph/acl.c
index d0b6b342dff982c487880beb9d5bd3868f7502d6..987044bca1c27176ab4d6fca34e5787ae3f9404c 100644 (file)
--- 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;

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index dd3a6dbf71ebcd8903ca6a04b2ba91fa24893baa..2aa3c0bcf3a52c6a02ea8a28d98e22f216eeee0d 100644 (file)
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1905,13 +1905,6 @@ int __ceph_setattr(struct inode *inode, struct iattr *attr)
        int inode_dirty_flags = 0;
        bool lock_snap_rwsem = false;
 
-       if (ceph_snap(inode) != CEPH_NOSNAP)
-               return -EROFS;
-
-       err = inode_change_ok(inode, attr);
-       if (err != 0)
-               return err;
-
        prealloc_cf = ceph_alloc_cap_flush();
        if (!prealloc_cf)
                return -ENOMEM;
@@ -2124,7 +2117,17 @@ out_put:
  */
 int ceph_setattr(struct dentry *dentry, struct iattr *attr)
 {
-       return __ceph_setattr(d_inode(dentry), attr);
+       struct inode *inode = d_inode(dentry);
+       int err;
+
+       if (ceph_snap(inode) != CEPH_NOSNAP)
+               return -EROFS;
+
+       err = inode_change_ok(inode, attr);
+       if (err != 0)
+               return err;
+
+       return __ceph_setattr(inode, attr);
 }
 
 /*