ocfs2: add ocfs2_acl_chmod

This function is used to update acl xattrs during file mode changes.

Signed-off-by: Tiger Yang <tiger.yang@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>

diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c
index a6a2bf6d684504ccd8d2aa1c5abcb1bb69594392..df72256c44220af941f5faf8569ba5c2edcc5c66 100644 (file)
--- a/fs/ocfs2/acl.c
+++ b/fs/ocfs2/acl.c
@@ -245,6 +245,33 @@ int ocfs2_check_acl(struct inode *inode, int mask)
        return -EAGAIN;
 }
 
+int ocfs2_acl_chmod(struct inode *inode)
+{
+       struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
+       struct posix_acl *acl, *clone;
+       int ret;
+
+       if (S_ISLNK(inode->i_mode))
+               return -EOPNOTSUPP;
+
+       if (!(osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL))
+               return 0;
+
+       acl = ocfs2_get_acl(inode, ACL_TYPE_ACCESS);
+       if (IS_ERR(acl) || !acl)
+               return PTR_ERR(acl);
+       clone = posix_acl_clone(acl, GFP_KERNEL);
+       posix_acl_release(acl);
+       if (!clone)
+               return -ENOMEM;
+       ret = posix_acl_chmod_masq(clone, inode->i_mode);
+       if (!ret)
+               ret = ocfs2_set_acl(NULL, inode, NULL, ACL_TYPE_ACCESS,
+                                   clone, NULL, NULL);
+       posix_acl_release(clone);
+       return ret;
+}
+
 static size_t ocfs2_xattr_list_acl_access(struct inode *inode,
                                          char *list,
                                          size_t list_len,

diff --git a/fs/ocfs2/acl.h b/fs/ocfs2/acl.h
index fef10f1b782b2213f496edd9798f58b91fa45217..68ffd6436c5080237e55eab06fb798e3422d9d07 100644 (file)
--- a/fs/ocfs2/acl.h
+++ b/fs/ocfs2/acl.h
@@ -29,10 +29,15 @@ struct ocfs2_acl_entry {
 #ifdef CONFIG_OCFS2_FS_POSIX_ACL
 
 extern int ocfs2_check_acl(struct inode *, int);
+extern int ocfs2_acl_chmod(struct inode *);
 
 #else /* CONFIG_OCFS2_FS_POSIX_ACL*/
 
 #define ocfs2_check_acl NULL
+static inline int ocfs2_acl_chmod(struct inode *inode)
+{
+       return 0;
+}
 
 #endif /* CONFIG_OCFS2_FS_POSIX_ACL*/
 

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 7bad7d9b9a2c23f5b697495703e722a9572f8523..4636aa6b01177fd75895cd89547235daa1695ed3 100644 (file)
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -990,6 +990,12 @@ bail_unlock_rw:
 bail:
        brelse(bh);
 
+       if (!status && attr->ia_valid & ATTR_MODE) {
+               status = ocfs2_acl_chmod(inode);
+               if (status < 0)
+                       mlog_errno(status);
+       }
+
        mlog_exit(status);
        return status;
 }