diff mbox series

[3/7] block: rename BLK_FLAG_MISALIGNED

Message ID 20240625110603.50885-4-hch@lst.de (mailing list archive)
State New
Headers show
Series [1/7] md: set md-specific flags for all queue limits | expand

Commit Message

Christoph Hellwig June 25, 2024, 11:05 a.m. UTC 
This is a flag for ->flags and not a feature for ->features.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/blk-settings.c   | 18 +++++++++---------
 include/linux/blkdev.h |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

Comments

John Garry June 25, 2024, 11:24 a.m. UTC | #1 
On 25/06/2024 12:05, Christoph Hellwig wrote:
> @@ -351,7 +351,7 @@ static int blk_validate_limits(struct queue_limits *lim)
>   
>   	if (lim->alignment_offset) {
>   		lim->alignment_offset &= (lim->physical_block_size - 1);
> -		lim->features &= ~BLK_FEAT_MISALIGNED;
> +		lim->features &= ~BLK_FLAG_MISALIGNED;

The comment for enum which BLK_FLAG_MISALIGNED is a member of reads 
"internal flags for queue_limits.flags", so it might help to comment why 
we clear in lim->features (if correct to do so).

>   	}
Christoph Hellwig June 25, 2024, 2:34 p.m. UTC | #2 
On Tue, Jun 25, 2024 at 12:24:07PM +0100, John Garry wrote:
> On 25/06/2024 12:05, Christoph Hellwig wrote:
> > @@ -351,7 +351,7 @@ static int blk_validate_limits(struct queue_limits *lim)
> >   	if (lim->alignment_offset) {
> >   		lim->alignment_offset &= (lim->physical_block_size - 1);
> > -		lim->features &= ~BLK_FEAT_MISALIGNED;
> > +		lim->features &= ~BLK_FLAG_MISALIGNED;
> 
> The comment for enum which BLK_FLAG_MISALIGNED is a member of reads
> "internal flags for queue_limits.flags", so it might help to comment why we
> clear in lim->features (if correct to do so).

Or fix that as well.  And probably move to a __bitwise type to make
sparse catch this.
diff mbox series

Patch

diff --git a/block/blk-settings.c b/block/blk-settings.c
index ec7dbe93d5c324..2ae7f8579de3fd 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -351,7 +351,7 @@  static int blk_validate_limits(struct queue_limits *lim)
 
 	if (lim->alignment_offset) {
 		lim->alignment_offset &= (lim->physical_block_size - 1);
-		lim->features &= ~BLK_FEAT_MISALIGNED;
+		lim->features &= ~BLK_FLAG_MISALIGNED;
 	}
 
 	if (!(lim->features & BLK_FEAT_WRITE_CACHE))
@@ -564,7 +564,7 @@  int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
 	if (!(b->features & BLK_FEAT_POLL))
 		t->features &= ~BLK_FEAT_POLL;
 
-	t->flags |= (b->flags & BLK_FEAT_MISALIGNED);
+	t->flags |= (b->flags & BLK_FLAG_MISALIGNED);
 
 	t->max_sectors = min_not_zero(t->max_sectors, b->max_sectors);
 	t->max_user_sectors = min_not_zero(t->max_user_sectors,
@@ -603,7 +603,7 @@  int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
 
 		/* Verify that top and bottom intervals line up */
 		if (max(top, bottom) % min(top, bottom)) {
-			t->flags |= BLK_FEAT_MISALIGNED;
+			t->flags |= BLK_FLAG_MISALIGNED;
 			ret = -1;
 		}
 	}
@@ -625,28 +625,28 @@  int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
 	/* Physical block size a multiple of the logical block size? */
 	if (t->physical_block_size & (t->logical_block_size - 1)) {
 		t->physical_block_size = t->logical_block_size;
-		t->flags |= BLK_FEAT_MISALIGNED;
+		t->flags |= BLK_FLAG_MISALIGNED;
 		ret = -1;
 	}
 
 	/* Minimum I/O a multiple of the physical block size? */
 	if (t->io_min & (t->physical_block_size - 1)) {
 		t->io_min = t->physical_block_size;
-		t->flags |= BLK_FEAT_MISALIGNED;
+		t->flags |= BLK_FLAG_MISALIGNED;
 		ret = -1;
 	}
 
 	/* Optimal I/O a multiple of the physical block size? */
 	if (t->io_opt & (t->physical_block_size - 1)) {
 		t->io_opt = 0;
-		t->flags |= BLK_FEAT_MISALIGNED;
+		t->flags |= BLK_FLAG_MISALIGNED;
 		ret = -1;
 	}
 
 	/* chunk_sectors a multiple of the physical block size? */
 	if ((t->chunk_sectors << 9) & (t->physical_block_size - 1)) {
 		t->chunk_sectors = 0;
-		t->flags |= BLK_FEAT_MISALIGNED;
+		t->flags |= BLK_FLAG_MISALIGNED;
 		ret = -1;
 	}
 
@@ -656,7 +656,7 @@  int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
 
 	/* Verify that new alignment_offset is on a logical block boundary */
 	if (t->alignment_offset & (t->logical_block_size - 1)) {
-		t->flags |= BLK_FEAT_MISALIGNED;
+		t->flags |= BLK_FLAG_MISALIGNED;
 		ret = -1;
 	}
 
@@ -809,7 +809,7 @@  int bdev_alignment_offset(struct block_device *bdev)
 {
 	struct request_queue *q = bdev_get_queue(bdev);
 
-	if (q->limits.flags & BLK_FEAT_MISALIGNED)
+	if (q->limits.flags & BLK_FLAG_MISALIGNED)
 		return -1;
 	if (bdev_is_partition(bdev))
 		return queue_limit_alignment_offset(&q->limits,
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index b2f1362c46814f..1a7e9d9c16d78b 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -347,7 +347,7 @@  enum {
 	BLK_FLAG_WRITE_CACHE_DISABLED		= (1u << 0),
 
 	/* I/O topology is misaligned */
-	BLK_FEAT_MISALIGNED			= (1u << 1),
+	BLK_FLAG_MISALIGNED			= (1u << 1),
 };
 
 struct queue_limits {