From: Miklos Szeredi Date: Mon, 31 Oct 2016 13:42:14 +0000 (+0100) Subject: ovl: fix get_acl() on tmpfs X-Git-Tag: v4.8.7~63 X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be9015460ed58cd5ec2f944e29d09cdf32f0345c;p=linux ovl: fix get_acl() on tmpfs commit b93d4a0eb308d4400b84c8b24c1b80e09a9497d0 upstream. 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 Signed-off-by: Miklos Szeredi Fixes: 39a25b2b3762 ("ovl: define ->get_acl() for overlay inodes") Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index c75625c1efa3..cf2bfeb1b385 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -294,9 +294,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);