]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ovl: fix get_acl() on tmpfs
authorMiklos Szeredi <mszeredi@redhat.com>
Mon, 31 Oct 2016 13:42:14 +0000 (14:42 +0100)
committerChuck Anderson <chuck.anderson@oracle.com>
Sun, 15 Oct 2017 23:56:59 +0000 (16:56 -0700)
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
Orabug: 26975443

(backport upstream commit b93d4a0eb308d4400b84c8b24c1b80e09a9497d0)

Signed-off-by: Shan Hai <shan.hai@oracle.com>
fs/overlayfs/inode.c

index f30e3887c2f4b77fc05e7568e159d6e4c5dde144..b3b365e92084ecf35ec1c37ab18f89f6174b5bd1 100644 (file)
@@ -314,9 +314,6 @@ struct posix_acl *ovl_get_acl(struct inode *inode, int type)
        if (!IS_ENABLED(CONFIG_FS_POSIX_ACL) || !IS_POSIXACL(realinode))
                return NULL;
 
-       if (!realinode->i_op->get_acl)
-               return NULL;
-
        old_cred = ovl_override_creds(inode->i_sb);
        acl = get_acl(realinode, type);
        revert_creds(old_cred);