From 7066004ce95ac299ad64bb783e1fa770b5bc784a Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Thu, 15 Dec 2011 13:36:29 -0500 Subject: [PATCH] --- yaml --- r: 276751 b: refs/heads/master c: e755d9ab387c4c2401dce5b6f435432a829f41cb h: refs/heads/master i: 276749: e7ca2c7b2c7d9a62538f4098b756a704646609eb 276747: baa578f2b544e38e3f5f03099c515803b4bb8719 276743: 30079ead1085d2fcfdcc1adb01e979c1c6b996c3 276735: a2b7d2ab53ac298fa7c45e081b400c5217525baf v: v3 --- [refs] | 2 +- trunk/fs/btrfs/delayed-inode.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4db18b8b2dca..32130adf85b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad19db71f498fd858dd84ce603efcf97e321f184 +refs/heads/master: e755d9ab387c4c2401dce5b6f435432a829f41cb diff --git a/trunk/fs/btrfs/delayed-inode.c b/trunk/fs/btrfs/delayed-inode.c index 6a1a6800776c..c7ddf8a01c54 100644 --- a/trunk/fs/btrfs/delayed-inode.c +++ b/trunk/fs/btrfs/delayed-inode.c @@ -640,8 +640,8 @@ static int btrfs_delayed_inode_reserve_metadata( * Now if src_rsv == delalloc_block_rsv we'll let it just steal since * we're accounted for. */ - if (!trans->bytes_reserved && - src_rsv != &root->fs_info->delalloc_block_rsv) { + if (!src_rsv || (!trans->bytes_reserved && + src_rsv != &root->fs_info->delalloc_block_rsv)) { ret = btrfs_block_rsv_add_noflush(root, dst_rsv, num_bytes); /* * Since we're under a transaction reserve_metadata_bytes could