Skip to contentSkip to conversation

btrfs: Remove unnecessary finish_wait() in wait_current_trans()

PATCH In review Miao Xie 1 participant 1 message Mar 25, 2010 Btrfs file system

lore
Share & tools
lore

Miao Xie

author
#0 lore raw

PATCH 13/18 btrfs: Remove unnecessary finish_wait() in wait_current_trans()

From: Zhao Lei <[email protected]>

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)

---
 fs/btrfs/transaction.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)
fs/btrfs/transaction.c +5 -10
index 2d654c1..4305428 100644
@@ -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);
 	}
 }
Signature · 1 line
1.6.5.2