ceph: properly apply umask when ACL is enabled

when ACL is enabled, posix_acl_create() may change inode's mode

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>

diff --git a/fs/ceph/acl.c b/fs/ceph/acl.c
index 469f2e8657e8426bfb3ad94fb12dde25e06ccb18..cebf2ebefb55dfeb79fe7b23bddd1165e4d4f344 100644 (file)
--- a/fs/ceph/acl.c
+++ b/fs/ceph/acl.c
@@ -172,14 +172,24 @@ out:
 int ceph_init_acl(struct dentry *dentry, struct inode *inode, struct inode *dir)
 {
        struct posix_acl *default_acl, *acl;
+       umode_t new_mode = inode->i_mode;
        int error;
 
-       error = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);
+       error = posix_acl_create(dir, &new_mode, &default_acl, &acl);
        if (error)
                return error;
 
-       if (!default_acl && !acl)
+       if (!default_acl && !acl) {
                cache_no_acl(inode);
+               if (new_mode != inode->i_mode) {
+                       struct iattr newattrs = {
+                               .ia_mode = new_mode,
+                               .ia_valid = ATTR_MODE,
+                       };
+                       error = ceph_setattr(dentry, &newattrs);
+               }
+               return error;
+       }
 
        if (default_acl) {
                error = ceph_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);