block: submit_bh() inadvertently discards barrier flag on a sync write

[linux-2.6] / fs / ext2 / acl.h

diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
index fed96ae81a7d1c380a999a6c83e26ae44b621a6a..b42cf578554b5fd10ec8c290ea3fca3af05f9020 100644 (file)
--- a/fs/ext2/acl.h
+++ b/fs/ext2/acl.h
@@ -4,7 +4,7 @@
   (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org>
 */
 
-#include <linux/xattr_acl.h>
+#include <linux/posix_acl_xattr.h>
 
 #define EXT2_ACL_VERSION       0x0001
 
@@ -58,7 +58,7 @@ static inline int ext2_acl_count(size_t size)
 #define EXT2_ACL_NOT_CACHED ((void *)-1)
 
 /* acl.c */
-extern int ext2_permission (struct inode *, int, struct nameidata *);
+extern int ext2_permission (struct inode *, int);
 extern int ext2_acl_chmod (struct inode *);
 extern int ext2_init_acl (struct inode *, struct inode *);