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 Tue, Jul 26, 2011 at 1:58 AM, Markus Trippelsdorf
<markus@trippelsdorf.de> wrote:
>
> #ifdefs are ugly. The following fixes the issue for me:

Actually, I think the proper fix is just the following
(whitespace-damaged). It's better to just set ".get_acl" to NULL, and
it's what we used to do back when it was called "check_acl" (see
commit 4e34e719e45).

Christoph?

Linus

---
fs/xfs/xfs_acl.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h
index 2c656ef49473..b97a6edcab9d 100644
--- a/fs/xfs/xfs_acl.h
+++ b/fs/xfs/xfs_acl.h
@@ -51,7 +51,7 @@ extern int posix_acl_default_exists(struct inode *inode);
extern const struct xattr_handler xfs_xattr_acl_access_handler;
extern const struct xattr_handler xfs_xattr_acl_default_handler;
#else
-# define xfs_get_acl(inode, type) NULL
+# define xfs_get_acl NULL
# define xfs_inherit_acl(inode, default_acl) 0
# define xfs_acl_chmod(inode) 0
# define posix_acl_access_exists(inode) 0

\
 
 \ /
  Last update: 2011-07-26 17:57    [W:0.065 / U:0.188 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site