X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fext4%2Facl.c;h=c7d04e165446dfc5391930b24ce2a1d3280e71d1;hb=39675e89fb472c1b9c8e740e00acb1df2bbc6be7;hp=cc92624a46a282bd83a338e8ba1792d161ee19b7;hpb=216553c4b7f3e3e2beb4981cddca9b2027523928;p=linux-2.6

diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c
index cc92624a46..c7d04e1654 100644
--- a/fs/ext4/acl.c
+++ b/fs/ext4/acl.c
@@ -9,8 +9,8 @@
 #include <linux/slab.h>
 #include <linux/capability.h>
 #include <linux/fs.h>
-#include <linux/ext4_jbd2.h>
-#include <linux/ext4_fs.h>
+#include "ext4_jbd2.h"
+#include "ext4.h"
 #include "xattr.h"
 #include "acl.h"
 
@@ -299,7 +299,7 @@ ext4_check_acl(struct inode *inode, int mask)
 }
 
 int
-ext4_permission(struct inode *inode, int mask, struct nameidata *nd)
+ext4_permission(struct inode *inode, int mask)
 {
 	return generic_permission(inode, mask, ext4_check_acl);
 }