Commit 09c57a76 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.7-2023-12-29' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:
 "Fix for a badly numbered flag, and a regression fix for the badblocks
  updates from this merge window"

* tag 'block-6.7-2023-12-29' of git://git.kernel.dk/linux:
  block: renumber QUEUE_FLAG_HW_WC
  badblocks: avoid checking invalid range in badblocks_check()
parents 8735c7c8 02d374f3

block/badblocks.c

+4 −2
Original line number Diff line number Diff line
@@ -1312,12 +1312,14 @@ static int _badblocks_check(struct badblocks *bb, sector_t s, int sectors, 
	prev = prev_badblocks(bb, &bad, hint);



	/* start after all badblocks */

	if ((prev + 1) >= bb->count && !overlap_front(bb, prev, &bad)) {

	if ((prev >= 0) &&

	    ((prev + 1) >= bb->count) && !overlap_front(bb, prev, &bad)) {

		len = sectors;

		goto update_sectors;

	}



	if (overlap_front(bb, prev, &bad)) {

	/* Overlapped with front badblocks record */

	if ((prev >= 0) && overlap_front(bb, prev, &bad)) {

		if (BB_ACK(p[prev]))

			acked_badblocks++;

		else

include/linux/blkdev.h

+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ struct request_queue { 
#define QUEUE_FLAG_ADD_RANDOM	10	/* Contributes to random pool */

#define QUEUE_FLAG_SYNCHRONOUS	11	/* always completes in submit context */

#define QUEUE_FLAG_SAME_FORCE	12	/* force complete on same CPU */

#define QUEUE_FLAG_HW_WC	18	/* Write back caching supported */

#define QUEUE_FLAG_HW_WC	13	/* Write back caching supported */

#define QUEUE_FLAG_INIT_DONE	14	/* queue is initialized */

#define QUEUE_FLAG_STABLE_WRITES 15	/* don't modify blks until WB is done */

#define QUEUE_FLAG_POLL		16	/* IO polling enabled if set */