From dfb546d3261084cccd633d0e2285b082936461d2 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 2 Nov 2010 09:34:50 -0400 Subject: [PATCH] --- yaml --- r: 221543 b: refs/heads/master c: eb8abb927ae2fd1730e24ea94cd9527f3c086292 h: refs/heads/master i: 221541: 5a5c58b148e175b45643ec14acbb81b05b170318 221539: 002fcf97a359a33a79625292337cf7647997fb71 221535: db8b0332c33f20fea055c93a42de56b15a0a9fb5 v: v3 --- [refs] | 2 +- trunk/fs/ext4/inode.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7547aa319dd9..3583341fbf4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fe19da4ca38fc20cdbc7020fcf2eca8fc756410 +refs/heads/master: eb8abb927ae2fd1730e24ea94cd9527f3c086292 diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index 191616470466..4d78342f3bf0 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/fs/ext4/inode.c @@ -5410,9 +5410,7 @@ int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry, * 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; - spin_unlock(&EXT4_I(inode)->i_block_reservation_lock); stat->blocks += (delalloc_blocks << inode->i_sb->s_blocksize_bits)>>9; return 0;