From 23efd3205f9522738be639a3df9853177a7bae5a Mon Sep 17 00:00:00 2001 From: Liu Bo Date: Tue, 21 Aug 2012 21:13:25 -0600 Subject: [PATCH] --- yaml --- r: 322373 b: refs/heads/master c: d280e5be940931c84bb2e9831ead9d02bc785484 h: refs/heads/master i: 322371: 098c252ed0fd1ae6330a9195be8aeed4ca414d28 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/inode.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1a6377ffc726..59dba9653bc9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24c03fa5cf3d02c327cf9f2fc39f72664b1bd7e1 +refs/heads/master: d280e5be940931c84bb2e9831ead9d02bc785484 diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index 38cda78de5e4..6ba80b902877 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/fs/btrfs/inode.c @@ -1882,8 +1882,11 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) trans = btrfs_join_transaction_nolock(root); else trans = btrfs_join_transaction(root); - if (IS_ERR(trans)) - return PTR_ERR(trans); + if (IS_ERR(trans)) { + ret = PTR_ERR(trans); + trans = NULL; + goto out; + } trans->block_rsv = &root->fs_info->delalloc_block_rsv; ret = btrfs_update_inode_fallback(trans, root, inode); if (ret) /* -ENOMEM or corruption */