[PATCH] Take i_mutex in splice_from_pipe()

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

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index d3a40815410128650b0f2aab847621b48fb4fa9f..63233cd946a7333bc8079795a1f3d7c32c1b2485 100644 (file)
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -53,7 +53,7 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
-#include <linux/ext4_jbd.h>
+#include <linux/ext4_jbd2.h>
 #include <linux/ext4_fs.h>
 #include <linux/mbcache.h>
 #include <linux/quotaops.h>
@@ -233,7 +233,7 @@ ext4_xattr_block_get(struct inode *inode, int name_index, const char *name,
                atomic_read(&(bh->b_count)), le32_to_cpu(BHDR(bh)->h_refcount));
        if (ext4_xattr_check_block(bh)) {
 bad_block:     ext4_error(inode->i_sb, __FUNCTION__,
-                          "inode %lu: bad block "E3FSBLK, inode->i_ino,
+                          "inode %lu: bad block %llu", inode->i_ino,
                           EXT4_I(inode)->i_file_acl);
                error = -EIO;
                goto cleanup;
@@ -375,7 +375,7 @@ ext4_xattr_block_list(struct inode *inode, char *buffer, size_t buffer_size)
                atomic_read(&(bh->b_count)), le32_to_cpu(BHDR(bh)->h_refcount));
        if (ext4_xattr_check_block(bh)) {
                ext4_error(inode->i_sb, __FUNCTION__,
-                          "inode %lu: bad block "E3FSBLK, inode->i_ino,
+                          "inode %lu: bad block %llu", inode->i_ino,
                           EXT4_I(inode)->i_file_acl);
                error = -EIO;
                goto cleanup;
@@ -647,7 +647,7 @@ ext4_xattr_block_find(struct inode *inode, struct ext4_xattr_info *i,
                        le32_to_cpu(BHDR(bs->bh)->h_refcount));
                if (ext4_xattr_check_block(bs->bh)) {
                        ext4_error(sb, __FUNCTION__,
-                               "inode %lu: bad block "E3FSBLK, inode->i_ino,
+                               "inode %lu: bad block %llu", inode->i_ino,
                                EXT4_I(inode)->i_file_acl);
                        error = -EIO;
                        goto cleanup;
@@ -848,7 +848,7 @@ cleanup_dquot:
 
 bad_block:
        ext4_error(inode->i_sb, __FUNCTION__,
-                  "inode %lu: bad block "E3FSBLK, inode->i_ino,
+                  "inode %lu: bad block %llu", inode->i_ino,
                   EXT4_I(inode)->i_file_acl);
        goto cleanup;
 
@@ -1077,14 +1077,14 @@ ext4_xattr_delete_inode(handle_t *handle, struct inode *inode)
        bh = sb_bread(inode->i_sb, EXT4_I(inode)->i_file_acl);
        if (!bh) {
                ext4_error(inode->i_sb, __FUNCTION__,
-                       "inode %lu: block "E3FSBLK" read error", inode->i_ino,
+                       "inode %lu: block %llu read error", inode->i_ino,
                        EXT4_I(inode)->i_file_acl);
                goto cleanup;
        }
        if (BHDR(bh)->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC) ||
            BHDR(bh)->h_blocks != cpu_to_le32(1)) {
                ext4_error(inode->i_sb, __FUNCTION__,
-                       "inode %lu: bad block "E3FSBLK, inode->i_ino,
+                       "inode %lu: bad block %llu", inode->i_ino,
                        EXT4_I(inode)->i_file_acl);
                goto cleanup;
        }