summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2011-07-14 03:17:14 +0000
committerChris Mason <chris.mason@oracle.com>2011-08-01 14:30:47 -0400
commitb9c8300c2ac354d850159f301d5b3ead13854cdd (patch)
tree3c8a07481fda046b52d098780ea2eb02ac5b7e8d /fs
parent72d63ed6427cf233e2b352c0b80c3e5c5a444986 (diff)
downloadlinux-b9c8300c2ac354d850159f301d5b3ead13854cdd.tar.gz
linux-b9c8300c2ac354d850159f301d5b3ead13854cdd.tar.bz2
linux-b9c8300c2ac354d850159f301d5b3ead13854cdd.zip
Btrfs: remove a BUG_ON() in btrfs_commit_transaction()
wait_for_commit() always returns 0. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/transaction.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index ff5549fe4624..7dc36fab4afc 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -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)
@@ -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);