Merge tag 'jfs-for-4.20' of git://github.com/kleikamp/linux-shaggy

Pull jfs updates from David Kleikamp:
 "Just a few small fixes"

* tag 'jfs-for-4.20' of git://github.com/kleikamp/linux-shaggy:
  jfs: remove redundant dquot_initialize() in jfs_evict_inode()
  jfs: remove quota option from ignore list
  jfs: cache NULL when both default_acl and acl are NULL

diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c
index 2e71b6e7e646a489e35bad17c23cc2140c5bc64b..8c06a6ea862d8004982c493c9b3693a928cec2ad 100644 (file)
--- a/fs/jfs/acl.c
+++ b/fs/jfs/acl.c
@@ -146,12 +146,16 @@ int jfs_init_acl(tid_t tid, struct inode *inode, struct inode *dir)
        if (default_acl) {
                rc = __jfs_set_acl(tid, inode, ACL_TYPE_DEFAULT, default_acl);
                posix_acl_release(default_acl);
+       } else {
+               inode->i_default_acl = NULL;
        }
 
        if (acl) {
                if (!rc)
                        rc = __jfs_set_acl(tid, inode, ACL_TYPE_ACCESS, acl);
                posix_acl_release(acl);
+       } else {
+               inode->i_acl = NULL;
        }
 
        JFS_IP(inode)->mode2 = (JFS_IP(inode)->mode2 & 0xffff0000) |

diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 054cc761b426fa510a33df464bd788342576f3fc..805ae9e8944aa113d2c293f8d4b988428ea8fe11 100644 (file)
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -166,7 +166,6 @@ void jfs_evict_inode(struct inode *inode)
                        /*
                         * Free the inode from the quota allocation.
                         */
-                       dquot_initialize(inode);
                        dquot_free_inode(inode);
                }
        } else {

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 09da5cf14e2774022b1879eba30997a8035fc4da..65d8fc87ab1145a1ac52ff5909ecd2888b79342e 100644 (file)
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -247,7 +247,7 @@ static const match_table_t tokens = {
        {Opt_resize_nosize, "resize"},
        {Opt_errors, "errors=%s"},
        {Opt_ignore, "noquota"},
-       {Opt_ignore, "quota"},
+       {Opt_quota, "quota"},
        {Opt_usrquota, "usrquota"},
        {Opt_grpquota, "grpquota"},
        {Opt_uid, "uid=%u"},