diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-24 17:22:16 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-24 17:22:16 +0100 |
| commit | deba28b12bcb5e11c6f6689f4edd96eea4929162 (patch) | |
| tree | c09af5596008766183e967212259f3640415d4cb | |
| parent | 318b067a5dd649d198c2ba00cf7408d778fc00b4 (diff) | |
| parent | 1390643d1d5c539be4d7031a0c507565cb1168a0 (diff) | |
| download | hid-deba28b12bcb5e11c6f6689f4edd96eea4929162.tar.gz | |
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
| -rw-r--r-- | fs/jfs/acl.c | 4 | ||||
| -rw-r--r-- | fs/jfs/inode.c | 1 | ||||
| -rw-r--r-- | fs/jfs/super.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c index 2e71b6e7e646a4..8c06a6ea862d80 100644 --- 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 054cc761b426fa..805ae9e8944aa1 100644 --- 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 09da5cf14e2774..65d8fc87ab1145 100644 --- 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"}, |