From patchwork Mon Jun 13 20:44:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102228 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1727682qgf; Mon, 13 Jun 2016 13:44:46 -0700 (PDT) X-Received: by 10.66.89.66 with SMTP id bm2mr4239908pab.154.1465850686316; Mon, 13 Jun 2016 13:44:46 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si4798115pak.136.2016.06.13.13.44.45; Mon, 13 Jun 2016 13:44:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423425AbcFMUo1 (ORCPT + 30 others); Mon, 13 Jun 2016 16:44:27 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:50212 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422685AbcFMUoZ (ORCPT ); Mon, 13 Jun 2016 16:44:25 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue005) with ESMTPA (Nemesis) id 0LhifF-1bq2H33l4L-00mr6E; Mon, 13 Jun 2016 22:43:53 +0200 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Arnd Bergmann , Oleg Drokin , Andreas Dilger , James Simmons , John Hammond , Jinshan Xiong , Mike Rapoport , lustre-devel@lists.lustre.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] lustre: hide call to Posix ACL in ifdef Date: Mon, 13 Jun 2016 22:44:57 +0200 Message-Id: <1465850722-3534417-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:LI5opCxJ/M+GM00O0vuxg9UZprBRzmgom9i5HTPFbyYXMOyvRIS wi3YS9b0SeJZho+g7dwRm17lYCP4wYlc73WiW6mxyEKprV3Y4LTY503nzf1BLvwVOMrhhl0 ng3HrrxX8WyF7NdOI+Ypxv8BCq7CTYa5k0SxD7IDy3kA1THtQXHzsiVAXFAsf7vS6TWdmKf nHs4hQBKXYSgwj98vZHJw== X-UI-Out-Filterresults: notjunk:1; V01:K0:ckynyYAk3H8=:2JCS/IK6A8ExK7rImUijFk TV7m4oj7NNj4HXl6wv3IumQLh1/OJObCUF8hcghe5kiK6X+j4cFa/VZBtRlWZkCan/NYogHtk aPi2RAAYnPcQq8E5kvC93JgJO1WCfyLDtcl64YjmHrJsyhGkTyIfMND21CRGr15TJFeQLQcB6 4QAiOFmw0/ez85quucNY+9+KOFqNV+i06Qau6IyOW75tf1SdvvJiB5aoeUUgInfjLPUa1fEeK nNUE9VV3J8jKy7X3t9EeedvTknJ0HqQOmGE1JBdDRn6BNcCz4lS/c+nJwDJvMF2pWzJFBSUNo 7KuU5Y5y2/5bWLMhZFp1SaB8SApm260+XZEf8sLy0LnSivP9OA4N1FJtb0iW7kSXlr4kyhqP0 cmWe8fOL8iOsnJ2y+zVcegBF6Y+FCRb8g7db3q9JIKD0KnIMQYw0XUUYdOB9b6CCtgHcufEOk cD03TTpVSAz26Z4UkU5i3ojJp5H40lVAZnui1Rzh1PLS14xiYS66ifnJRROLtE+Oav2Dwltqr 9LyZ5dH63TtrQ0L/4eW2Dxbmpmpffxt5fLnzeHxiygaatTncRzsIFKRnA0Nh+SlwcizYw+uwM lRa+dHbVxpXx/FNtBb914SXU3+7VQpeDntii6m06IpiiX0Tdi/+Ib7pAJBWQQeUuSdBgBtfpI pRY+9ElVkIzY7UMXTDqiFEpsW4gS+mnj0G+EtrXV9VOmdhC68Cw9ub0snvugQSUWmZto= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A call to forget_cached_acl() was recently added to the lustre file system, but this is only available when CONFIG_FS_POSIX_ACL is enabled, otherwise the build now fails with: lustre/llite/file.c: In function 'll_get_acl': lustre/llite/file.c:3134:2: error: implicit declaration of function 'forget_cached_acl' [-Werror=implicit-function-declaration] forget_cached_acl(inode, type); This adds one more #ifdef for this call, corresponding to the other 22 such checks for ACL in lustre. Signed-off-by: Arnd Bergmann Fixes: b788dc51e425 ("staging: lustre: llite: drop acl from cache") --- drivers/staging/lustre/lustre/llite/file.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.7.0 diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c index bafa0b701e87..26c6cd60ae1d 100644 --- a/drivers/staging/lustre/lustre/llite/file.c +++ b/drivers/staging/lustre/lustre/llite/file.c @@ -3131,7 +3131,9 @@ struct posix_acl *ll_get_acl(struct inode *inode, int type) spin_lock(&lli->lli_lock); /* VFS' acl_permission_check->check_acl will release the refcount */ acl = posix_acl_dup(lli->lli_posix_acl); +#ifdef CONFIG_FS_POSIX_ACL forget_cached_acl(inode, type); +#endif spin_unlock(&lli->lli_lock); return acl;