diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 16:22:31 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 16:22:46 -0500 |
| commit | 1fc3eb81100c3f3cd44e706e54390151b0f1ce74 (patch) | |
| tree | 922f64310caa55a3b417958a1c256a96f47c4b66 /fs/btrfs/delayed-inode.c | |
| parent | e006d6563bca989aeae1bc5ebc03dacdf5e15b32 (diff) | |
| parent | ee9ba0f2fd5819e377cdec974a2022a7af02a385 (diff) | |
Merge branch 'imx/board' into next/boards
* imx/board: (4 commits)
Enable 32 bit flash support for iMX21ADS board
ARM: mx31pdk: Add MC13783 RTC support
iomux-mx25: configuration to support CSPI3 on CSI pins
MX1:apf9328: Add i2c support
Updated to v3.2-rc6, conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'fs/btrfs/delayed-inode.c')
| -rw-r--r-- | fs/btrfs/delayed-inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 5b163572e0ca..9c1eccc2c503 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c | |||
| @@ -640,8 +640,8 @@ static int btrfs_delayed_inode_reserve_metadata( | |||
| 640 | * Now if src_rsv == delalloc_block_rsv we'll let it just steal since | 640 | * Now if src_rsv == delalloc_block_rsv we'll let it just steal since |
| 641 | * we're accounted for. | 641 | * we're accounted for. |
| 642 | */ | 642 | */ |
| 643 | if (!trans->bytes_reserved && | 643 | if (!src_rsv || (!trans->bytes_reserved && |
| 644 | src_rsv != &root->fs_info->delalloc_block_rsv) { | 644 | src_rsv != &root->fs_info->delalloc_block_rsv)) { |
| 645 | ret = btrfs_block_rsv_add_noflush(root, dst_rsv, num_bytes); | 645 | ret = btrfs_block_rsv_add_noflush(root, dst_rsv, num_bytes); |
| 646 | /* | 646 | /* |
| 647 | * Since we're under a transaction reserve_metadata_bytes could | 647 | * Since we're under a transaction reserve_metadata_bytes could |