Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[pandora-kernel.git] / fs / ext4 / inode.c

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 846e1e9..bdbe699 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -5412,9 +5412,7 @@ int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry,
         * will return the blocks that include the delayed allocation
         * blocks for this file.
         */
         * will return the blocks that include the delayed allocation
         * blocks for this file.
         */

-       spin_lock(&EXT4_I(inode)->i_block_reservation_lock);

        delalloc_blocks = EXT4_I(inode)->i_reserved_data_blocks;
        delalloc_blocks = EXT4_I(inode)->i_reserved_data_blocks;

-       spin_unlock(&EXT4_I(inode)->i_block_reservation_lock);

 
        stat->blocks += (delalloc_blocks << inode->i_sb->s_blocksize_bits)>>9;
        return 0;
 
        stat->blocks += (delalloc_blocks << inode->i_sb->s_blocksize_bits)>>9;
        return 0;