lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: remove a BUG_ON() in btrfs_commit_transaction()

Browse Source 
wait_for_commit() always returns 0.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Li Zefan
2011-07-14 03:17:14 +00:00
committed by Chris Mason
parent 72d63ed642
commit b9c8300c2a
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/btrfs/transaction.c
View File

@@ -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 */ /* 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) struct btrfs_transaction *commit)
{ {
wait_event(commit->commit_wait, commit->commit_done); wait_event(commit->commit_wait, commit->commit_done);
return 0;
} }
int btrfs_wait_for_commit(struct btrfs_root *root, u64 transid) int btrfs_wait_for_commit(struct btrfs_root *root, u64 transid)
@@ -1189,8 +1188,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
atomic_inc(&cur_trans->use_count); atomic_inc(&cur_trans->use_count);
btrfs_end_transaction(trans, root); btrfs_end_transaction(trans, root);
ret = wait_for_commit(root, cur_trans); wait_for_commit(root, cur_trans);
BUG_ON(ret);
put_transaction(cur_trans); put_transaction(cur_trans);