From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Jul 2011 06:21:50 +0000 (-0700)
Subject: ext2: remove duplicate 'ext2_get_acl()' define
X-Git-Tag: MMI-PSA29.97-13-9~18741
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=59ed2bb27492f74ab898ee1e26c69dfd78444640;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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