bcache: remove bch_crc64_update

bch_crc64_update is an entirely pointless wrapper around crc64_be.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Coly Li <colyli@suse.de>
Link: https://lore.kernel.org/r/20211020143812.6403-9-colyli@suse.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
index 0595559de174a9806e792b785362e6866a97e5ea..93b67b8d31c3dedc931ac64e273411651e1e6fd2 100644 (file)
--- a/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
@@ -141,7 +141,7 @@ static uint64_t btree_csum_set(struct btree *b, struct bset *i)
        uint64_t crc = b->key.ptr[0];
        void *data = (void *) i + 8, *end = bset_bkey_last(i);
 
-       crc = bch_crc64_update(crc, data, end - data);
+       crc = crc64_be(crc, data, end - data);
        return crc ^ 0xffffffffffffffffULL;
 }
 

diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
index f86909a66ac684d2df092d101cbd6934938cb011..d15aae6c51c13021638179ae4cf00d1fcf7f421f 100644 (file)
--- a/drivers/md/bcache/request.c
+++ b/drivers/md/bcache/request.c
@@ -46,7 +46,7 @@ static void bio_csum(struct bio *bio, struct bkey *k)
        bio_for_each_segment(bv, bio, iter) {
                void *d = kmap(bv.bv_page) + bv.bv_offset;
 
-               csum = bch_crc64_update(csum, d, bv.bv_len);
+               csum = crc64_be(csum, d, bv.bv_len);
                kunmap(bv.bv_page);
        }
 

diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h
index b64460a7626771c68b983b1d4dcaf7219f73e50a..6274d6a17e5e7d05d224a949c4cba798245315dd 100644 (file)
--- a/drivers/md/bcache/util.h
+++ b/drivers/md/bcache/util.h
@@ -548,14 +548,6 @@ static inline uint64_t bch_crc64(const void *p, size_t len)
        return crc ^ 0xffffffffffffffffULL;
 }
 
-static inline uint64_t bch_crc64_update(uint64_t crc,
-                                       const void *p,
-                                       size_t len)
-{
-       crc = crc64_be(crc, p, len);
-       return crc;
-}
-
 /*
  * A stepwise-linear pseudo-exponential.  This returns 1 << (x >>
  * frac_bits), with the less-significant bits filled in by linear