diff options
author | Miklos Szeredi <mszeredi@redhat.com> | 2016-10-31 09:42:14 -0400 |
---|---|---|
committer | Miklos Szeredi <mszeredi@redhat.com> | 2016-10-31 09:42:14 -0400 |
commit | b93d4a0eb308d4400b84c8b24c1b80e09a9497d0 (patch) | |
tree | 40fa05b7a3785fd7ee18c7d1860598b9664403bd /fs | |
parent | fd3220d37b1f6f0cab6142d98b0e6c4082e63299 (diff) |
ovl: fix get_acl() on tmpfs
tmpfs doesn't have ->get_acl() because it only uses cached acls.
This fixes the acl tests in pjdfstest when tmpfs is used as the upper layer
of the overlay.
Reported-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Fixes: 39a25b2b3762 ("ovl: define ->get_acl() for overlay inodes")
Cc: <stable@vger.kernel.org> # v4.8
Diffstat (limited to 'fs')
-rw-r--r-- | fs/overlayfs/inode.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index c58f01babf30..7fb53d055537 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c | |||
@@ -270,9 +270,6 @@ struct posix_acl *ovl_get_acl(struct inode *inode, int type) | |||
270 | if (!IS_ENABLED(CONFIG_FS_POSIX_ACL) || !IS_POSIXACL(realinode)) | 270 | if (!IS_ENABLED(CONFIG_FS_POSIX_ACL) || !IS_POSIXACL(realinode)) |
271 | return NULL; | 271 | return NULL; |
272 | 272 | ||
273 | if (!realinode->i_op->get_acl) | ||
274 | return NULL; | ||
275 | |||
276 | old_cred = ovl_override_creds(inode->i_sb); | 273 | old_cred = ovl_override_creds(inode->i_sb); |
277 | acl = get_acl(realinode, type); | 274 | acl = get_acl(realinode, type); |
278 | revert_creds(old_cred); | 275 | revert_creds(old_cred); |