diff options
| author | Zhao Lei <zhaolei@cn.fujitsu.com> | 2010-03-25 12:35:14 +0000 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2010-03-30 21:19:08 -0400 |
| commit | 471fa17dff556ad38caf26de097c0630530d8cbe (patch) | |
| tree | 1a89bf8fa9eb34df3512c1216d5a92a29327a98d /fs/btrfs | |
| parent | 90d2c51dbb4db05c040bc7db264bb7ab35e35455 (diff) | |
| download | kernel_samsung_crespo-471fa17dff556ad38caf26de097c0630530d8cbe.zip kernel_samsung_crespo-471fa17dff556ad38caf26de097c0630530d8cbe.tar.gz kernel_samsung_crespo-471fa17dff556ad38caf26de097c0630530d8cbe.tar.bz2 | |
Btrfs: Remove unnecessary finish_wait() in wait_current_trans()
We only need to call finish_wait() after wait loop.
By the way, this patch makes code of waiting loop similar to
example in wait.h(no functional change)
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/transaction.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 2d654c1..4305428 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -147,18 +147,13 @@ static void wait_current_trans(struct btrfs_root *root) while (1) { prepare_to_wait(&root->fs_info->transaction_wait, &wait, TASK_UNINTERRUPTIBLE); - if (cur_trans->blocked) { - mutex_unlock(&root->fs_info->trans_mutex); - schedule(); - mutex_lock(&root->fs_info->trans_mutex); - finish_wait(&root->fs_info->transaction_wait, - &wait); - } else { - finish_wait(&root->fs_info->transaction_wait, - &wait); + if (!cur_trans->blocked) break; - } + mutex_unlock(&root->fs_info->trans_mutex); + schedule(); + mutex_lock(&root->fs_info->trans_mutex); } + finish_wait(&root->fs_info->transaction_wait, &wait); put_transaction(cur_trans); } } |