Merge tag 'for-6.9/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/devic...

[sfrench/cifs-2.6.git] / drivers / md / dm-integrity.c

diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index bb3486bfab7722c9a0e64b4d8de812fecf8f6b50..d822ab2f739b070154193296934fb72e0200e36f 100644 (file)
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -1691,14 +1691,13 @@ failed:
        get_random_bytes(result, ic->tag_size);
 }
 
-static void integrity_recheck(struct dm_integrity_io *dio)
+static noinline void integrity_recheck(struct dm_integrity_io *dio, char *checksum)
 {
        struct bio *bio = dm_bio_from_per_bio_data(dio, sizeof(struct dm_integrity_io));
        struct dm_integrity_c *ic = dio->ic;
        struct bvec_iter iter;
        struct bio_vec bv;
        sector_t sector, logical_sector, area, offset;
-       char checksum_onstack[max_t(size_t, HASH_MAX_DIGESTSIZE, MAX_TAG_SIZE)];
        struct page *page;
        void *buffer;
 
@@ -1734,9 +1733,8 @@ static void integrity_recheck(struct dm_integrity_io *dio)
                                goto free_ret;
                        }
 
-                       integrity_sector_checksum(ic, logical_sector, buffer,
-                                                 checksum_onstack);
-                       r = dm_integrity_rw_tag(ic, checksum_onstack, &dio->metadata_block,
+                       integrity_sector_checksum(ic, logical_sector, buffer, checksum);
+                       r = dm_integrity_rw_tag(ic, checksum, &dio->metadata_block,
                                                &dio->metadata_offset, ic->tag_size, TAG_CMP);
                        if (r) {
                                if (r > 0) {
@@ -1851,7 +1849,7 @@ again:
                                                checksums_ptr - checksums, dio->op == REQ_OP_READ ? TAG_CMP : TAG_WRITE);
                        if (unlikely(r)) {
                                if (r > 0) {
-                                       integrity_recheck(dio);
+                                       integrity_recheck(dio, checksums);
                                        goto skip_io;
                                }
                                if (likely(checksums != checksums_onstack))