Skip to contentSkip to conversation

Btrfs: remove unnecessary cur_trans set before goto loop in join_transaction

PATCH In review Wang Sheng-Hui 2 participants 2 messages Sep 24, 2012 – Jan 9, 2013 Btrfs file system

lore
Share & tools
lore

Wang Sheng-Hui

author
#0 lore raw

PATCH 3/4 Btrfs: remove unnecessary cur_trans set before goto loop in join_transaction

In the big loop, cur_trans will be set fs_info->running_transaction before it's used. And after kmem_cache_free it and goto loop, it will be setup again. No need to setup it immediately after freed.

Signed-off-by Wang Sheng-Hui <[email protected]>
---
 fs/btrfs/transaction.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
fs/btrfs/transaction.c +0 -1
index 469a8b6..675d813 100644
@@ -98,7 +98,6 @@ loop:
 		 * to redo the trans_no_join checks above
 		 */
 		kmem_cache_free(btrfs_transaction_cachep, cur_trans);
-		cur_trans = fs_info->running_transaction;
 		goto loop;
 	} else if (fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR) {
 		spin_unlock(&fs_info->trans_lock);
Signature · 1 line
1.7.1
#1 lore raw
Quoted 14 lines · Wang Sheng-Hui

In the big loop, cur_trans will be set fs_info->running_transaction before it's used. And after kmem_cache_free it and goto loop, it will be setup again. No need to setup it immediately after freed.

Signed-off-by Wang Sheng-Hui <[email protected]>
---
 fs/btrfs/transaction.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
fs/btrfs/transaction.c +0 -0
index 469a8b6..675d813 100644

fs/btrfs/transaction.c loop: · line 103

Quoted 7 lines
fs/btrfs/transaction.c +0 -1
@@ -98,7 +98,6 @@ loop:
 		 * to redo the trans_no_join checks above
 		 */
 		kmem_cache_free(btrfs_transaction_cachep, cur_trans);
-		cur_trans = fs_info->running_transaction;
 		goto loop;
 	} else if (fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR) {
 		spin_unlock(&fs_info->trans_lock);

This is Obviously Correct(TM) :-) and doesn't seem to have been picked up by btrfs maintainers. I am picking it up now.

Signature · 2 lines
Jiri Kosina
SUSE Labs