diff options
| author |   Chengguang Xu <cgxu519@gmx.com> | 2018-08-31 22:33:51 +0800 |
|---|---|---|
| committer |   Dave Kleikamp <dave.kleikamp@oracle.com> | 2018-09-06 11:56:26 -0500 |
| commit | e8d4ceeb34a58d47cc031ec023d61198ec8c4a80 (patch) | |
| tree | 9fd08b9062de7f0120475656257e6bbe25b2f72d /fs/jfs | |
| parent | Merge tag 'trace-v4.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (diff) | |
| download | linux-dev-e8d4ceeb34a58d47cc031ec023d61198ec8c4a80.tar.xz linux-dev-e8d4ceeb34a58d47cc031ec023d61198ec8c4a80.zip | |
jfs: cache NULL when both default_acl and acl are NULL
default_acl and acl of newly created inode will be initiated
as ACL_NOT_CACHED in vfs function inode_init_always() and later
will be updated by calling xxx_init_acl() in specific filesystems.
Howerver, when default_acl and acl are NULL then they keep the value
of ACL_NOT_CACHED, this patch tries to cache NULL for acl/default_acl
in this case.
Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Diffstat (limited to 'fs/jfs')
| -rw-r--r-- | fs/jfs/acl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c index 2e71b6e7e646..8c06a6ea862d 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) | |