[PATCH -next] bcachefs: Remove unneeded semicolon

[PATCH -next] bcachefs: Remove unneeded semicolon

[Yang Li]

./fs/bcachefs/btree_gc.c:1249:2-3: Unneeded semicolon
./fs/bcachefs/btree_gc.c:1521:2-3: Unneeded semicolon
./fs/bcachefs/btree_gc.c:1575:2-3: Unneeded semicolon
./fs/bcachefs/counters.c:46:2-3: Unneeded semicolon

Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
 fs/bcachefs/btree_gc.c | 6 +++---
 fs/bcachefs/counters.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
index dac2eb76c985..56c671638c43 100644
--- a/fs/bcachefs/btree_gc.c
+++ b/fs/bcachefs/btree_gc.c
@@ -1246,7 +1246,7 @@ static int bch2_gc_done(struct bch_fs *c,
 			copy_dev_field(d[i].sectors,	"%s sectors", bch2_data_types[i]);
 			copy_dev_field(d[i].fragmented,	"%s fragmented", bch2_data_types[i]);
 		}
-	};
+	}
 
 	{
 		unsigned nr = fs_usage_u64s(c);
@@ -1518,7 +1518,7 @@ static int bch2_gc_alloc_start(struct bch_fs *c, bool metadata_only)
 		buckets->first_bucket	= ca->mi.first_bucket;
 		buckets->nbuckets	= ca->mi.nbuckets;
 		rcu_assign_pointer(ca->buckets_gc, buckets);
-	};
+	}
 
 	bch2_trans_init(&trans, c, 0, 0);
 
@@ -1572,7 +1572,7 @@ static void bch2_gc_alloc_reset(struct bch_fs *c, bool metadata_only)
 			g->dirty_sectors = 0;
 			g->cached_sectors = 0;
 		}
-	};
+	}
 }
 
 static int bch2_gc_write_reflink_key(struct btree_trans *trans,
diff --git a/fs/bcachefs/counters.c b/fs/bcachefs/counters.c
index 442a9b806a3c..26eb3d82b1cb 100644
--- a/fs/bcachefs/counters.c
+++ b/fs/bcachefs/counters.c
@@ -43,7 +43,7 @@ static void bch2_sb_counters_to_text(struct printbuf *out, struct bch_sb *sb,
 		prt_tab(out);
 		prt_printf(out, "%llu", le64_to_cpu(ctrs->d[i]));
 		prt_newline(out);
-	};
+	}
 };
 
 int bch2_sb_counters_to_cpu(struct bch_fs *c)
-- 
2.20.1.7.g153144c

Re: [PATCH -next] bcachefs: Remove unneeded semicolon

[Brian Foster]

On Wed, Sep 13, 2023 at 08:57:56AM +0800, Yang Li wrote:
> ./fs/bcachefs/btree_gc.c:1249:2-3: Unneeded semicolon
> ./fs/bcachefs/btree_gc.c:1521:2-3: Unneeded semicolon
> ./fs/bcachefs/btree_gc.c:1575:2-3: Unneeded semicolon
> ./fs/bcachefs/counters.c:46:2-3: Unneeded semicolon
> 
> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
> ---

What produces these warnings? It would be help to add a sentence or two
of such context in the commit log.. even just a "XYZ reports the
following: ..."

Nit aside, patch seems fine to me:

Reviewed-by: Brian Foster <bfoster@redhat.com>

>  fs/bcachefs/btree_gc.c | 6 +++---
>  fs/bcachefs/counters.c | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
> index dac2eb76c985..56c671638c43 100644
> --- a/fs/bcachefs/btree_gc.c
> +++ b/fs/bcachefs/btree_gc.c
> @@ -1246,7 +1246,7 @@ static int bch2_gc_done(struct bch_fs *c,
>  			copy_dev_field(d[i].sectors,	"%s sectors", bch2_data_types[i]);
>  			copy_dev_field(d[i].fragmented,	"%s fragmented", bch2_data_types[i]);
>  		}
> -	};
> +	}
>  
>  	{
>  		unsigned nr = fs_usage_u64s(c);
> @@ -1518,7 +1518,7 @@ static int bch2_gc_alloc_start(struct bch_fs *c, bool metadata_only)
>  		buckets->first_bucket	= ca->mi.first_bucket;
>  		buckets->nbuckets	= ca->mi.nbuckets;
>  		rcu_assign_pointer(ca->buckets_gc, buckets);
> -	};
> +	}
>  
>  	bch2_trans_init(&trans, c, 0, 0);
>  
> @@ -1572,7 +1572,7 @@ static void bch2_gc_alloc_reset(struct bch_fs *c, bool metadata_only)
>  			g->dirty_sectors = 0;
>  			g->cached_sectors = 0;
>  		}
> -	};
> +	}
>  }
>  
>  static int bch2_gc_write_reflink_key(struct btree_trans *trans,
> diff --git a/fs/bcachefs/counters.c b/fs/bcachefs/counters.c
> index 442a9b806a3c..26eb3d82b1cb 100644
> --- a/fs/bcachefs/counters.c
> +++ b/fs/bcachefs/counters.c
> @@ -43,7 +43,7 @@ static void bch2_sb_counters_to_text(struct printbuf *out, struct bch_sb *sb,
>  		prt_tab(out);
>  		prt_printf(out, "%llu", le64_to_cpu(ctrs->d[i]));
>  		prt_newline(out);
> -	};
> +	}
>  };
>  
>  int bch2_sb_counters_to_cpu(struct bch_fs *c)
> -- 
> 2.20.1.7.g153144c
> 

[PATCH -next] bcachefs: Remove unneeded semicolon

[Yang Li]

./fs/bcachefs/reflink.c:112:32-33: Unneeded semicolon

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=7114
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
 fs/bcachefs/reflink.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/bcachefs/reflink.c b/fs/bcachefs/reflink.c
index eb31df605c2e..958d9ea718b0 100644
--- a/fs/bcachefs/reflink.c
+++ b/fs/bcachefs/reflink.c
@@ -109,7 +109,7 @@ static inline void check_indirect_extent_deleting(struct bkey_i *new, unsigned *
 	if ((*flags & BTREE_TRIGGER_INSERT) && !*bkey_refcount(new)) {
 		new->k.type = KEY_TYPE_deleted;
 		new->k.size = 0;
-		set_bkey_val_u64s(&new->k, 0);;
+		set_bkey_val_u64s(&new->k, 0);
 		*flags &= ~BTREE_TRIGGER_INSERT;
 	}
 }
-- 
2.20.1.7.g153144c

[PATCH -next] bcachefs: Remove unneeded semicolon

[Yang Li]

./fs/bcachefs/btree_write_buffer.c:285:63-64: Unneeded semicolon

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=7602
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
 fs/bcachefs/btree_write_buffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/bcachefs/btree_write_buffer.c b/fs/bcachefs/btree_write_buffer.c
index dce61d3949f3..e01664f10a8e 100644
--- a/fs/bcachefs/btree_write_buffer.c
+++ b/fs/bcachefs/btree_write_buffer.c
@@ -282,7 +282,7 @@ static int bch2_btree_write_buffer_flush_locked(struct btree_trans *trans)
 			struct btree_write_buffered_key *n = &wb->flushing.keys.data[i[1].idx];
 
 			skipped++;
-			n->journal_seq = min_t(u64, n->journal_seq, k->journal_seq);;
+			n->journal_seq = min_t(u64, n->journal_seq, k->journal_seq);
 			k->journal_seq = 0;
 			continue;
 		}
-- 
2.20.1.7.g153144c

[PATCH -next] bcachefs: Remove unneeded semicolon

[Yang Li]

./fs/bcachefs/super.c:1093:59-60: Unneeded semicolon
./fs/bcachefs/super.c:1097:59-60: Unneeded semicolon

Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
 fs/bcachefs/super.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c
index 64ff7da49860..bc254d69b596 100644
--- a/fs/bcachefs/super.c
+++ b/fs/bcachefs/super.c
@@ -1090,11 +1090,11 @@ static int bch2_dev_in_fs(struct bch_sb_handle *fs,
 		prt_newline(&buf);
 
 		prt_printf(&buf, "%pg ", fs->bdev);
-		bch2_prt_datetime(&buf, le64_to_cpu(fs->sb->write_time));;
+		bch2_prt_datetime(&buf, le64_to_cpu(fs->sb->write_time));
 		prt_newline(&buf);
 
 		prt_printf(&buf, "%pg ", sb->bdev);
-		bch2_prt_datetime(&buf, le64_to_cpu(sb->sb->write_time));;
+		bch2_prt_datetime(&buf, le64_to_cpu(sb->sb->write_time));
 		prt_newline(&buf);
 
 		prt_printf(&buf, "Not using older sb");
-- 
2.20.1.7.g153144c

[PATCH -next] bcachefs: Remove unneeded semicolon

[Yang Li]

./fs/bcachefs/btree_cache.c:502:13-14: Unneeded semicolon

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=10821
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
 fs/bcachefs/btree_cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/bcachefs/btree_cache.c b/fs/bcachefs/btree_cache.c
index 7b951b273306..bfd4cec70744 100644
--- a/fs/bcachefs/btree_cache.c
+++ b/fs/bcachefs/btree_cache.c
@@ -499,7 +499,7 @@ static unsigned long bch2_btree_cache_scan(struct shrinker *shrink,
 		if (btree_node_accessed(b)) {
 			clear_btree_node_accessed(b);
 			bc->not_freed[BCH_BTREE_CACHE_NOT_FREED_access_bit]++;
-			--touched;;
+			--touched;
 		} else if (!btree_node_reclaim(c, b, true)) {
 			bch2_btree_node_hash_remove(bc, b);
 
-- 
2.32.0.3.g01195cf9f

[PATCH -next] bcachefs: Remove unneeded semicolon

[Yang Li]

./fs/bcachefs/ec.c:903:24-25: Unneeded semicolon

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=10836
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
 fs/bcachefs/ec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/bcachefs/ec.c b/fs/bcachefs/ec.c
index c26319475876..c63d9c6fa734 100644
--- a/fs/bcachefs/ec.c
+++ b/fs/bcachefs/ec.c
@@ -900,7 +900,7 @@ int bch2_ec_read_extent(struct btree_trans *trans, struct bch_read_bio *rbio,
 	bch2_bkey_val_to_text(&msgbuf, c, orig_k);
 	bch_err_ratelimited(c,
 			    "error doing reconstruct read: %s\n  %s", msg, msgbuf.buf);
-	printbuf_exit(&msgbuf);;
+	printbuf_exit(&msgbuf);
 	ret = -BCH_ERR_stripe_reconstruct;
 	goto out;
 }
-- 
2.32.0.3.g01195cf9f

[PATCH -next] bcachefs: Remove unneeded semicolon

[Yang Li]

This patch removes an redundant semicolon.

./fs/bcachefs/btree_iter.c:2702:41-42: Unneeded semicolon
./fs/bcachefs/btree_cache.c:522:13-14: Unneeded semicolon

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=11751
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
 fs/bcachefs/btree_cache.c | 2 +-
 fs/bcachefs/btree_iter.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/bcachefs/btree_cache.c b/fs/bcachefs/btree_cache.c
index a0a406b0c7bc..c313a5bce886 100644
--- a/fs/bcachefs/btree_cache.c
+++ b/fs/bcachefs/btree_cache.c
@@ -519,7 +519,7 @@ static unsigned long bch2_btree_cache_scan(struct shrinker *shrink,
 		if (btree_node_accessed(b)) {
 			clear_btree_node_accessed(b);
 			bc->not_freed[BCH_BTREE_CACHE_NOT_FREED_access_bit]++;
-			--touched;;
+			--touched;
 		} else if (!btree_node_reclaim(c, b, true)) {
 			__bch2_btree_node_hash_remove(bc, b);
 			__btree_node_data_free(bc, b);
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index b47bfcc438f3..cc13fe1d2be6 100644
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -2699,7 +2699,7 @@ struct bkey_s_c bch2_btree_iter_peek_prev_min(struct btree_iter *iter, struct bp
 	}
 
 	/* Extents can straddle iter->pos: */
-	iter->pos = bpos_min(iter->pos, k.k->p);;
+	iter->pos = bpos_min(iter->pos, k.k->p);
 
 	if (iter->flags & BTREE_ITER_filter_snapshots)
 		iter->pos.snapshot = iter->snapshot;
-- 
2.32.0.3.g01195cf9f

[PATCH -next] bcachefs: remove unneeded semicolon

[Jiapeng Chong]

No functional modification involved.

./fs/bcachefs/btree_trans_commit.c:343:32-33: Unneeded semicolon.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=23409
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 fs/bcachefs/btree_trans_commit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/bcachefs/btree_trans_commit.c b/fs/bcachefs/btree_trans_commit.c
index 4d58bdb233e9..2a69c05a27bf 100644
--- a/fs/bcachefs/btree_trans_commit.c
+++ b/fs/bcachefs/btree_trans_commit.c
@@ -340,7 +340,7 @@ static inline void btree_insert_entry_checks(struct btree_trans *trans,
 	BUG_ON(i->cached	!= path->cached);
 	BUG_ON(i->cached &&
 	       !i->key_cache_already_flushed  &&
-	       bkey_deleted(&i->k->k));;
+	       bkey_deleted(&i->k->k));
 	BUG_ON(i->level		!= path->level);
 	BUG_ON(i->btree_id	!= path->btree_id);
 	BUG_ON(i->bkey_type	!= __btree_node_type(path->level, path->btree_id));
-- 
2.43.5