From b05fe44103e7cad31ad7f8e3cb170127bf610b46 Mon Sep 17 00:00:00 2001 From: Liu Bo Date: Fri, 22 Feb 2013 04:33:36 +0000 Subject: [PATCH] --- yaml --- r: 360485 b: refs/heads/master c: 2382c5cc7ed0396b61a359765bf5ee125b0a2f46 h: refs/heads/master i: 360483: 3398a32682fedce0691358603590ebcd74a2000a v: v3 --- [refs] | 2 +- trunk/fs/btrfs/transaction.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2f911777b22e..bcd18f8def92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a81cb9a2d939676dee6911993a37fa7e818ab72e +refs/heads/master: 2382c5cc7ed0396b61a359765bf5ee125b0a2f46 diff --git a/trunk/fs/btrfs/transaction.c b/trunk/fs/btrfs/transaction.c index a83d486cc70c..4330433b7b4f 100644 --- a/trunk/fs/btrfs/transaction.c +++ b/trunk/fs/btrfs/transaction.c @@ -1123,6 +1123,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, rsv = trans->block_rsv; trans->block_rsv = &pending->block_rsv; + trans->bytes_reserved = trans->block_rsv->reserved; dentry = pending->dentry; parent = dget_parent(dentry); @@ -1276,6 +1277,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, fail: dput(parent); trans->block_rsv = rsv; + trans->bytes_reserved = 0; no_free_objectid: kfree(new_root_item); root_item_alloc_fail: