| Message ID | 20230522222554.525229-2-bvanassche@acm.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Support limits below the page size | expand |
On Mon, May 22, 2023 at 03:25:33PM -0700, Bart Van Assche wrote: > Switch to the modern style of printing kernel messages. Use %u instead > of %d to print unsigned integers. > > Cc: Christoph Hellwig <hch@lst.de> > Cc: Ming Lei <ming.lei@redhat.com> > Cc: Keith Busch <kbusch@kernel.org> > Cc: Luis Chamberlain <mcgrof@kernel.org> > Signed-off-by: Bart Van Assche <bvanassche@acm.org> > --- > block/blk-settings.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/block/blk-settings.c b/block/blk-settings.c > index 896b4654ab00..1d8d2ae7bdf4 100644 > --- a/block/blk-settings.c > +++ b/block/blk-settings.c > @@ -127,8 +127,7 @@ void blk_queue_max_hw_sectors(struct request_queue *q, unsigned int max_hw_secto > > if ((max_hw_sectors << 9) < PAGE_SIZE) { > max_hw_sectors = 1 << (PAGE_SHIFT - 9); > - printk(KERN_INFO "%s: set to minimum %d\n", > - __func__, max_hw_sectors); > + pr_info("%s: set to minimum %u\n", __func__, max_hw_sectors); You may want to then also add at the very top of the file before any includes something like: #define pr_fmt(fmt) "blk-settings: " fmt You can see the other defines of pr_fmt on block/*.c Other than that: Reviewed-by: Luis Chamberlain <mcgrof@kernel.org> Luis
On 5/22/23 16:10, Luis Chamberlain wrote: > On Mon, May 22, 2023 at 03:25:33PM -0700, Bart Van Assche wrote: >> Switch to the modern style of printing kernel messages. Use %u instead >> of %d to print unsigned integers. >> >> Cc: Christoph Hellwig <hch@lst.de> >> Cc: Ming Lei <ming.lei@redhat.com> >> Cc: Keith Busch <kbusch@kernel.org> >> Cc: Luis Chamberlain <mcgrof@kernel.org> >> Signed-off-by: Bart Van Assche <bvanassche@acm.org> >> --- >> block/blk-settings.c | 12 ++++-------- >> 1 file changed, 4 insertions(+), 8 deletions(-) >> >> diff --git a/block/blk-settings.c b/block/blk-settings.c >> index 896b4654ab00..1d8d2ae7bdf4 100644 >> --- a/block/blk-settings.c >> +++ b/block/blk-settings.c >> @@ -127,8 +127,7 @@ void blk_queue_max_hw_sectors(struct request_queue *q, unsigned int max_hw_secto >> >> if ((max_hw_sectors << 9) < PAGE_SIZE) { >> max_hw_sectors = 1 << (PAGE_SHIFT - 9); >> - printk(KERN_INFO "%s: set to minimum %d\n", >> - __func__, max_hw_sectors); >> + pr_info("%s: set to minimum %u\n", __func__, max_hw_sectors); > > You may want to then also add at the very top of the file before any > includes something like: > > #define pr_fmt(fmt) "blk-settings: " fmt > > You can see the other defines of pr_fmt on block/*.c My goal with this patch is *not* to modify the output so I prefer not to define the pr_fmt() macro in this file. Thanks, Bart.
diff --git a/block/blk-settings.c b/block/blk-settings.c index 896b4654ab00..1d8d2ae7bdf4 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -127,8 +127,7 @@ void blk_queue_max_hw_sectors(struct request_queue *q, unsigned int max_hw_secto if ((max_hw_sectors << 9) < PAGE_SIZE) { max_hw_sectors = 1 << (PAGE_SHIFT - 9); - printk(KERN_INFO "%s: set to minimum %d\n", - __func__, max_hw_sectors); + pr_info("%s: set to minimum %u\n", __func__, max_hw_sectors); } max_hw_sectors = round_down(max_hw_sectors, @@ -248,8 +247,7 @@ void blk_queue_max_segments(struct request_queue *q, unsigned short max_segments { if (!max_segments) { max_segments = 1; - printk(KERN_INFO "%s: set to minimum %d\n", - __func__, max_segments); + pr_info("%s: set to minimum %u\n", __func__, max_segments); } q->limits.max_segments = max_segments; @@ -285,8 +283,7 @@ void blk_queue_max_segment_size(struct request_queue *q, unsigned int max_size) { if (max_size < PAGE_SIZE) { max_size = PAGE_SIZE; - printk(KERN_INFO "%s: set to minimum %d\n", - __func__, max_size); + pr_info("%s: set to minimum %u\n", __func__, max_size); } /* see blk_queue_virt_boundary() for the explanation */ @@ -740,8 +737,7 @@ void blk_queue_segment_boundary(struct request_queue *q, unsigned long mask) { if (mask < PAGE_SIZE - 1) { mask = PAGE_SIZE - 1; - printk(KERN_INFO "%s: set to minimum %lx\n", - __func__, mask); + pr_info("%s: set to minimum %lx\n", __func__, mask); } q->limits.seg_boundary_mask = mask;
Switch to the modern style of printing kernel messages. Use %u instead of %d to print unsigned integers. Cc: Christoph Hellwig <hch@lst.de> Cc: Ming Lei <ming.lei@redhat.com> Cc: Keith Busch <kbusch@kernel.org> Cc: Luis Chamberlain <mcgrof@kernel.org> Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- block/blk-settings.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)