lkml.org 
[lkml]   [2011]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
SubjectRe: [git pull] vfs pile 1.5
On Mon, Jul 25, 2011 at 8:35 PM, Markus Trippelsdorf
<markus@trippelsdorf.de> wrote:
>
> This breaks the build for "# CONFIG_FS_POSIX_ACL is not set" configs:

Of course it does. And as usual, my exhaustive testing was for the
allyesconfig case, rather than doing both allyesconfig and allnoconfig
like I should.

Bah.

Does the attached trivial patch fix everything for you?

Linus
fs/namei.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index ef00b984fb20..f8c69d373793 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -176,6 +176,7 @@ EXPORT_SYMBOL(putname);

static int check_acl(struct inode *inode, int mask)
{
+#ifdef CONFIG_FS_POSIX_ACL
struct posix_acl *acl;

/*
@@ -219,6 +220,7 @@ static int check_acl(struct inode *inode, int mask)
posix_acl_release(acl);
return error;
}
+#endif

return -EAGAIN;
}
\
 
 \ /
  Last update: 2011-07-26 06:57    [W:0.072 / U:0.024 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site