---

yaml --- r: 276751 b: refs/heads/master c: e755d9a h: refs/heads/master i: 276749: e7ca2c7 276747: baa578f 276743: 30079ea 276735: a2b7d2a v: v3
git-mirror · Dec 15, 2011 · 7066004 · 7066004
1 parent 503f058
commit 7066004
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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