1 files changed, 9 insertions, 7 deletions

diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c
index 5a8ea16eedbc..0c8ca830b113 100644
--- a/fs/jfs/acl.c
+++ b/fs/jfs/acl.c
@@ -83,13 +83,15 @@ static int __jfs_set_acl(tid_t tid, struct inode *inode, int type,
         switch (type) {
         case ACL_TYPE_ACCESS:
                 ea_name = POSIX_ACL_XATTR_ACCESS;
-                rc = posix_acl_equiv_mode(acl, &inode->i_mode);
-                if (rc < 0)
-                        return rc;
-                inode->i_ctime = CURRENT_TIME;
-                mark_inode_dirty(inode);
-                if (rc == 0)
-                        acl = NULL;
+                if (acl) {
+                        rc = posix_acl_equiv_mode(acl, &inode->i_mode);
+                        if (rc < 0)
+                                return rc;
+                        inode->i_ctime = CURRENT_TIME;
+                        mark_inode_dirty(inode);
+                        if (rc == 0)
+                                acl = NULL;
+                }
                 break;
         case ACL_TYPE_DEFAULT:
                 ea_name = POSIX_ACL_XATTR_DEFAULT;