Commit 0f629e72 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Andrew Morton
Browse files

btrfs: use xor_gen 

Use the new xor_gen helper instead of open coding the loop around
xor_blocks.  This helper is very similar to the existing run_xor helper in
btrfs, except that the destination buffer is passed explicitly.

Link: https://lkml.kernel.org/r/20260327061704.3707577-26-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarDavid Sterba <dsterba@suse.com>
Reviewed-by: default avatarEric Biggers <ebiggers@kernel.org>
Tested-by: default avatarEric Biggers <ebiggers@kernel.org>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: "Borislav Petkov (AMD)" <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Mason <clm@fb.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jason A. Donenfeld <jason@zx2c4.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Li Nan <linan122@huawei.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Magnus Lindholm <linmag7@gmail.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Song Liu <song@kernel.org>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Ted Ts'o <tytso@mit.edu>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 7c12c32b

fs/btrfs/raid56.c

+4 −23
Original line number Diff line number Diff line
@@ -617,26 +617,6 @@ static void cache_rbio(struct btrfs_raid_bio *rbio) 
	spin_unlock(&table->cache_lock);

}



/*

 * helper function to run the xor_blocks api.  It is only

 * able to do MAX_XOR_BLOCKS at a time, so we need to

 * loop through.

 */

static void run_xor(void **pages, int src_cnt, ssize_t len)

{

	int src_off = 0;

	int xor_src_cnt = 0;

	void *dest = pages[src_cnt];



	while(src_cnt > 0) {

		xor_src_cnt = min(src_cnt, MAX_XOR_BLOCKS);

		xor_blocks(xor_src_cnt, len, dest, pages + src_off);



		src_cnt -= xor_src_cnt;

		src_off += xor_src_cnt;

	}

}



/*

 * Returns true if the bio list inside this rbio covers an entire stripe (no

 * rmw required).
@@ -1434,7 +1414,8 @@ static void generate_pq_vertical_step(struct btrfs_raid_bio *rbio, unsigned int 
	} else {

		/* raid5 */

		memcpy(pointers[rbio->nr_data], pointers[0], step);

		run_xor(pointers + 1, rbio->nr_data - 1, step);

		xor_gen(pointers[rbio->nr_data], pointers + 1, rbio->nr_data - 1,

				step);

	}

	for (stripe = stripe - 1; stripe >= 0; stripe--)

		kunmap_local(pointers[stripe]);
@@ -2034,7 +2015,7 @@ static void recover_vertical_step(struct btrfs_raid_bio *rbio, 
		pointers[rbio->nr_data - 1] = p;



		/* Xor in the rest */

		run_xor(pointers, rbio->nr_data - 1, step);

		xor_gen(p, pointers, rbio->nr_data - 1, step);

	}



cleanup:
@@ -2672,7 +2653,7 @@ static bool verify_one_parity_step(struct btrfs_raid_bio *rbio, 
	} else {

		/* RAID5. */

		memcpy(pointers[nr_data], pointers[0], step);

		run_xor(pointers + 1, nr_data - 1, step);

		xor_gen(pointers[nr_data], pointers + 1, nr_data - 1, step);

	}



	/* Check scrubbing parity and repair it. */