Skip to content

Commit

Permalink
Btrfs: remove a BUG_ON() in btrfs_commit_transaction()
Browse files Browse the repository at this point in the history
wait_for_commit() always returns 0.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
  • Loading branch information
Li Zefan authored and Chris Mason committed Aug 1, 2011
1 parent 72d63ed commit b9c8300
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions fs/btrfs/transaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -351,11 +351,10 @@ struct btrfs_trans_handle *btrfs_start_ioctl_transaction(struct btrfs_root *root
}

/* wait for a transaction commit to be fully complete */
static noinline int wait_for_commit(struct btrfs_root *root,
static noinline void wait_for_commit(struct btrfs_root *root,
struct btrfs_transaction *commit)
{
wait_event(commit->commit_wait, commit->commit_done);
return 0;
}

int btrfs_wait_for_commit(struct btrfs_root *root, u64 transid)
Expand Down Expand Up @@ -1189,8 +1188,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
atomic_inc(&cur_trans->use_count);
btrfs_end_transaction(trans, root);

ret = wait_for_commit(root, cur_trans);
BUG_ON(ret);
wait_for_commit(root, cur_trans);

put_transaction(cur_trans);

Expand Down

0 comments on commit b9c8300

Please sign in to comment.