summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-29 23:21:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-29 23:21:50 -0700
commit59ed2bb27492f74ab898ee1e26c69dfd78444640 (patch)
tree193cd839d4c9ed523e1d8dbb6e3709ef9f38df11 /fs
parent55f9c40ff632d03c527d6a6ceddcda0a224587a6 (diff)
downloadlinux-3.10-59ed2bb27492f74ab898ee1e26c69dfd78444640.tar.gz
linux-3.10-59ed2bb27492f74ab898ee1e26c69dfd78444640.tar.bz2
linux-3.10-59ed2bb27492f74ab898ee1e26c69dfd78444640.zip
ext2: remove duplicate 'ext2_get_acl()' define
When commit 4e34e719e457 ("fs: take the ACL checks to common code") changed the xyz_check_acl() functions into the more natural xyz_get_acl() interface, we grew two copies of the #define ext2_get_acl NULL define for the non-acl case. Remove the extra one. Reported-by: Marco Stornelli <marco.stornelli@gmail.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext2/acl.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
index 5c0a6a4fb05..503bfb0ed79 100644
--- a/fs/ext2/acl.h
+++ b/fs/ext2/acl.h
@@ -61,7 +61,6 @@ extern int ext2_init_acl (struct inode *, struct inode *);
#else
#include <linux/sched.h>
#define ext2_get_acl NULL
-#define ext2_get_acl NULL
#define ext2_set_acl NULL
static inline int