diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-05-13 22:19:32 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-05-13 22:19:32 +0000 |
| commit | baa456331738b4e76a92318b62b354377a30ad80 (patch) | |
| tree | 75c828a7c8a9f1b5f7f41b2e53271eafb7e561ef /fs/ext4/extents.c | |
| parent | aa3e5572c538d753dce11bf93532a75f95d22b40 (diff) | |
| parent | 4462dc02842698f173f518c1f5ce79c0fb89395a (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/inode.c
Diffstat (limited to 'fs/ext4/extents.c')
| -rw-r--r-- | fs/ext4/extents.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 94c8ee81f5e1..236b834b4ca8 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3879,6 +3879,7 @@ static int ext4_xattr_fiemap(struct inode *inode, physical += offset; length = EXT4_SB(inode->i_sb)->s_inode_size - offset; flags |= FIEMAP_EXTENT_DATA_INLINE; + brelse(iloc.bh); } else { /* external block */ physical = EXT4_I(inode)->i_file_acl << blockbits; length = inode->i_sb->s_blocksize; |