diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-07-18 07:55:44 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2007-07-18 07:55:44 +0300 |
| commit | 45dff1900d4c3eb81e0a1ea8611c172e4a736088 (patch) | |
| tree | cc74c9ceef825dc254f4d0bd6205f716bbcc4407 /fs/ext4/balloc.c | |
| parent | 0dfb860def58bfb2daa000af490ed1986373fea5 (diff) | |
| parent | cb32da0416b823b7f4b65e7e85d6cba16ca4d1e1 (diff) | |
KVM: Merge remote branch 'origin/master'kvm-30
Conflicts:
drivers/kvm/kvm.h
drivers/kvm/kvm_main.c
drivers/kvm/mmu.c
drivers/kvm/svm.c
drivers/kvm/vmx.c
drivers/kvm/x86_emulate.c
Diffstat (limited to 'fs/ext4/balloc.c')
| -rw-r--r-- | fs/ext4/balloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index 3b64bb16c727..9de54ae48dee 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c @@ -1585,7 +1585,7 @@ allocated: ret_block = grp_alloc_blk + ext4_group_first_block_no(sb, group_no); if (in_range(ext4_block_bitmap(sb, gdp), ret_block, num) || - in_range(ext4_block_bitmap(sb, gdp), ret_block, num) || + in_range(ext4_inode_bitmap(sb, gdp), ret_block, num) || in_range(ret_block, ext4_inode_table(sb, gdp), EXT4_SB(sb)->s_itb_per_group) || in_range(ret_block + num - 1, ext4_inode_table(sb, gdp), |