Skip to contentSkip to conversation

bcachefs: Remove the unused variable journal_flags

PATCH In review Jiapeng Chong 2 participants 2 messages Nov 15, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bcachefs: Remove the unused variable journal_flags

Variable journal_flags is not effectively used, so delete it.

fs/bcachefs/btree_update_interior.c:1057:11: warning: variable 'journal_flags' set but not used.

---
 fs/bcachefs/btree_update_interior.c | 5 -----
 1 file changed, 5 deletions(-)
fs/bcachefs/btree_update_interior.c +0 -5
index 9affcb22d9cb..18e5a75142e9 100644
@@ -1054,7 +1054,6 @@ bch2_btree_update_start(struct btree_trans *trans, struct btree_path *path,
 	unsigned nr_nodes[2] = { 0, 0 };
 	unsigned update_level = level;
 	enum bch_watermark watermark = flags & BCH_WATERMARK_MASK;
-	unsigned journal_flags = 0;
 	int ret = 0;
 	u32 restart_count = trans->restart_count;
 
@@ -1068,10 +1067,6 @@ bch2_btree_update_start(struct btree_trans *trans, struct btree_path *path,
 	flags &= ~BCH_WATERMARK_MASK;
 	flags |= watermark;
 
-	if (flags & BCH_TRANS_COMMIT_journal_reclaim)
-		journal_flags |= JOURNAL_RES_GET_NONBLOCK;
-	journal_flags |= watermark;
-
 	while (1) {
 		nr_nodes[!!update_level] += 1 + split;
 		update_level++;
Signature · 1 line
2.20.1.7.g153144c
#1 lore raw
Quoted 37 lines · Jiapeng Chong

Variable journal_flags is not effectively used, so delete it.

fs/bcachefs/btree_update_interior.c:1057:11: warning: variable 'journal_flags' set but not used.

---
 fs/bcachefs/btree_update_interior.c | 5 -----
 1 file changed, 5 deletions(-)
fs/bcachefs/btree_update_interior.c +0 -5
index 9affcb22d9cb..18e5a75142e9 100644
@@ -1054,7 +1054,6 @@ bch2_btree_update_start(struct btree_trans *trans, struct btree_path *path,
 	unsigned nr_nodes[2] = { 0, 0 };
 	unsigned update_level = level;
 	enum bch_watermark watermark = flags & BCH_WATERMARK_MASK;
-	unsigned journal_flags = 0;
 	int ret = 0;
 	u32 restart_count = trans->restart_count;
 
@@ -1068,10 +1067,6 @@ bch2_btree_update_start(struct btree_trans *trans, struct btree_path *path,
 	flags &= ~BCH_WATERMARK_MASK;
 	flags |= watermark;
 
-	if (flags & BCH_TRANS_COMMIT_journal_reclaim)
-		journal_flags |= JOURNAL_RES_GET_NONBLOCK;
-	journal_flags |= watermark;
-
 	while (1) {
 		nr_nodes[!!update_level] += 1 + split;
 		update_level++;
Signature · 1 line
2.20.1.7.g153144c

Yup, this is a leftover from deleting journal pre-reservations.