From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753368AbbKCNof (ORCPT ); Tue, 3 Nov 2015 08:44:35 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:61516 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751770AbbKCNoe (ORCPT ); Tue, 3 Nov 2015 08:44:34 -0500 From: Arnd Bergmann To: Dave Chinner Cc: Dave Chinner , Brian Foster , Andreas Gruenbacher , xfs@oss.sgi.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] xfs: only modify ACLs if CONFIG_XFS_POSIX_ACL enabled Date: Tue, 03 Nov 2015 14:43:58 +0100 Message-ID: <4425824.kIWhRaBxBZ@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:IKzBcwP+e4iHMXkRDYjfgGZy7Wb2b2rhVV+Nlg4+C3mqxsbmf4d VPZ7lZ+ow3OFUhHf+KvzdBSqdQfFWgOIHRiROQANfFbhDfvehZObEXKjEZxGe9oC1M3mf+Z /I2gkwGNgoHQiozxyEJMVsaTv1JdN4seA9hr696HRovjGMJoP1n3iby/ys7rNEzwfkkMlg5 yZxOV/tMIEcksBVKUmwhw== X-UI-Out-Filterresults: notjunk:1;V01:K0:tR4k5bxNivo=:eeXM01pztZedAqYJJBiRwB HK8mmPhX9QdPR8RjKeQTsHJktvUPP44ehD7eoqTNDYYIGvXc3+qpnfsmjzN0OWafwqkMviXFw v0d3bKDaH6GBkZtDzW5V0tTX8b0w4qRAuLEcmzJf8z7BEk9kFPNGX9VIBo5m3L6P6j/sFKlLN 2pKK+9T3eKjpZXP5pe4dAUlocx0YBxdrvvgZRXEtypyuQsbDMSnGj70Y498fgkNzl0zee20VL u5hwB5NYkT9dHL+kxOteXw7efsnoZbBA3kyavTr18jp7AdNMjoZedJubiti6GfmFXRzBKZWzS tZkSHiBxNVeixfobttTmyP5U8rRlQp3o497RBdggSSY7Ga2kifJmLhPYTNyBIGHSynLIETmM7 kEAhvyW1xXu5C28URylNJ7jusnlz1mguOT0M27pNxtQC4ok0TB3MV90BqCfM5M7X1RJHbYKRl MhcNLE69Z7/hkdG24uUgqJNFrEX/szxBGr/ruB61AuiCEYUZVY70b7alvZi1gGZdXqRklC35/ Gurr6a83Uyv9ZbLAaZuvYdCTa01ZshwIbhidOaQ6gTJDZGLz+Bvch2gv7rzP75aXc8zHKcKUH gbeQYYxpjgmdSZ6RLhAOfnJYkrj6y+UPRlj4yRY2MWUywsjbYTipqMVq7jozkyYTMNbInUW9Z 0gnc99E2qz3HJ0ApCGXBwWe0f1Jab6beXBn0QbEVG+dfsHInikWR5efWiuF7oZ3YWwUYH51AG 0Jrp9TI2qb70GF3P Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A recent bug fix added a call to forget_cached_acl(), but that function is not always available, so we can get a build error here: fs/xfs/xfs_xattr.c: In function 'xfs_xattr_set': fs/xfs/xfs_xattr.c:84:4: error: implicit declaration of function 'forget_cached_acl' [-Werror=implicit-function-declaration] This changes the code to use the same #ifdef that we already use to encapsule the existing ACL handling. Signed-off-by: Arnd Bergmann Fixes: 6caa105651cb ("xfs: invalidate cached acl if set directly via xattr") --- This started breaking ARM davinci_all_defconfig today in linux-next diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c index 2e1eb80d5374..6229325abdd3 100644 --- a/fs/xfs/xfs_xattr.c +++ b/fs/xfs/xfs_xattr.c @@ -73,6 +73,7 @@ xfs_xattr_set(struct dentry *dentry, const char *name, const void *value, return xfs_attr_remove(ip, (unsigned char *)name, xflags); error = xfs_attr_set(ip, (unsigned char *)name, (void *)value, size, xflags); +#ifdef CONFIG_XFS_POSIX_ACL /* * Invalidate any cached ACLs if the user has bypassed the ACL * interface. We don't validate the content whatsoever so it is caller @@ -85,6 +86,7 @@ xfs_xattr_set(struct dentry *dentry, const char *name, const void *value, else if (!strncmp(name, SGI_ACL_DEFAULT, strlen(name))) forget_cached_acl(VFS_I(ip), ACL_TYPE_DEFAULT); } +#endif return error; }