diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 08:21:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 08:21:50 +0200 |
| commit | 59ed2bb27492f74ab898ee1e26c69dfd78444640 (patch) | |
| tree | 193cd839d4c9ed523e1d8dbb6e3709ef9f38df11 /fs/ext2/acl.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| download | linux-59ed2bb27492f74ab898ee1e26c69dfd78444640.tar.xz linux-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/ext2/acl.h')
| -rw-r--r-- | fs/ext2/acl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h index 5c0a6a4fb052..503bfb0ed79b 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 |