Pull error-inject into release branch

[linux-2.6] / fs / ext4 / acl.c

diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c
index d143489aeb4c02537e9cd252e5a4a690b3c4acc0..9e882546d91a098a01b409301f9baa2e00d4fce1 100644 (file)
--- a/fs/ext4/acl.c
+++ b/fs/ext4/acl.c
@@ -9,7 +9,7 @@
 #include <linux/slab.h>
 #include <linux/capability.h>
 #include <linux/fs.h>
-#include <linux/ext4_jbd.h>
+#include <linux/ext4_jbd2.h>
 #include <linux/ext4_fs.h>
 #include "xattr.h"
 #include "acl.h"
@@ -141,7 +141,7 @@ ext4_iget_acl(struct inode *inode, struct posix_acl **i_acl)
 
 static inline void
 ext4_iset_acl(struct inode *inode, struct posix_acl **i_acl,
-                  struct posix_acl *acl)
+               struct posix_acl *acl)
 {
        spin_lock(&inode->i_lock);
        if (*i_acl != EXT4_ACL_NOT_CACHED)
@@ -375,7 +375,7 @@ int
 ext4_acl_chmod(struct inode *inode)
 {
        struct posix_acl *acl, *clone;
-        int error;
+       int error;
 
        if (S_ISLNK(inode->i_mode))
                return -EOPNOTSUPP;