From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
martin.petersen@oracle.com, bob.liu@oracle.com, axboe@kernel.dk,
agk@redhat.com, snitzer@redhat.com, dm-devel@redhat.com,
song@kernel.org, tytso@mit.edu, adilger.kernel@dilger.ca,
Chaitanya.Kulkarni@wdc.com, darrick.wong@oracle.com,
ming.lei@redhat.com, osandov@fb.com, jthumshirn@suse.de,
minwoo.im.dev@gmail.com, damien.lemoal@wdc.com,
andrea.parri@amarulasolutions.com, hare@suse.com, tj@kernel.org,
ajay.joshi@wdc.com, sagi@grimberg.me, dsterba@suse.com,
chaitanya.kulkarni@wdc.com, bvanassche@acm.org,
dhowells@redhat.com, asml.silence@gmail.com,
ktkhai@virtuozzo.com
Subject: [PATCH v4 2/7] block: Pass op_flags into blk_queue_get_max_sectors()
Date: Tue, 21 Jan 2020 13:42:31 +0300 [thread overview]
Message-ID: <157960335141.108120.13282906580976004888.stgit@localhost.localdomain> (raw)
In-Reply-To: <157960325642.108120.13626623438131044304.stgit@localhost.localdomain>
This preparation patch changes argument type, and now
the function takes full op_flags instead of just op code.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
block/blk-core.c | 4 ++--
include/linux/blkdev.h | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index 50a5de025d5e..ac2634bcda1f 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1250,10 +1250,10 @@ EXPORT_SYMBOL(submit_bio);
static int blk_cloned_rq_check_limits(struct request_queue *q,
struct request *rq)
{
- if (blk_rq_sectors(rq) > blk_queue_get_max_sectors(q, req_op(rq))) {
+ if (blk_rq_sectors(rq) > blk_queue_get_max_sectors(q, rq->cmd_flags)) {
printk(KERN_ERR "%s: over max size limit. (%u > %u)\n",
__func__, blk_rq_sectors(rq),
- blk_queue_get_max_sectors(q, req_op(rq)));
+ blk_queue_get_max_sectors(q, rq->cmd_flags));
return -EIO;
}
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 0f1127d0b043..23a5850f35f6 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -989,8 +989,10 @@ static inline struct bio_vec req_bvec(struct request *rq)
}
static inline unsigned int blk_queue_get_max_sectors(struct request_queue *q,
- int op)
+ unsigned int op_flags)
{
+ int op = op_flags & REQ_OP_MASK;
+
if (unlikely(op == REQ_OP_DISCARD || op == REQ_OP_SECURE_ERASE))
return min(q->limits.max_discard_sectors,
UINT_MAX >> SECTOR_SHIFT);
@@ -1029,10 +1031,10 @@ static inline unsigned int blk_rq_get_max_sectors(struct request *rq,
if (!q->limits.chunk_sectors ||
req_op(rq) == REQ_OP_DISCARD ||
req_op(rq) == REQ_OP_SECURE_ERASE)
- return blk_queue_get_max_sectors(q, req_op(rq));
+ return blk_queue_get_max_sectors(q, rq->cmd_flags);
return min(blk_max_size_offset(q, offset),
- blk_queue_get_max_sectors(q, req_op(rq)));
+ blk_queue_get_max_sectors(q, rq->cmd_flags));
}
static inline unsigned int blk_rq_count_bios(struct request *rq)
next prev parent reply other threads:[~2020-01-21 10:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-21 10:42 [PATCH v4 0/7] block: Introduce REQ_ALLOCATE flag for REQ_OP_WRITE_ZEROES Kirill Tkhai
2020-01-21 10:42 ` [PATCH v4 1/7] block: Add @flags argument to bdev_write_zeroes_sectors() Kirill Tkhai
2020-01-21 10:42 ` Kirill Tkhai [this message]
2020-01-21 10:42 ` [PATCH v4 3/7] block: Introduce blk_queue_get_max_write_zeroes_sectors() Kirill Tkhai
2020-01-21 10:42 ` [PATCH v4 4/7] block: Add support for REQ_ALLOCATE flag Kirill Tkhai
2020-01-21 10:42 ` [PATCH v4 5/7] block: Add blk_queue_max_allocate_sectors() Kirill Tkhai
2020-01-21 10:42 ` [PATCH v4 6/7] dm: Directly disable max_allocate_sectors for now Kirill Tkhai
2020-01-21 12:24 ` Mike Snitzer
2020-01-21 12:36 ` Kirill Tkhai
2020-01-21 13:33 ` Kirill Tkhai
2020-01-21 13:48 ` Mike Snitzer
2020-01-21 14:20 ` Kirill Tkhai
2020-01-21 14:43 ` Mike Snitzer
2020-01-21 15:13 ` Kirill Tkhai
2020-01-21 10:42 ` [PATCH v4 7/7] loop: Add support for REQ_ALLOCATE Kirill Tkhai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=157960335141.108120.13282906580976004888.stgit@localhost.localdomain \
--to=ktkhai@virtuozzo.com \
--cc=Chaitanya.Kulkarni@wdc.com \
--cc=adilger.kernel@dilger.ca \
--cc=agk@redhat.com \
--cc=ajay.joshi@wdc.com \
--cc=andrea.parri@amarulasolutions.com \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=bob.liu@oracle.com \
--cc=bvanassche@acm.org \
--cc=damien.lemoal@wdc.com \
--cc=darrick.wong@oracle.com \
--cc=dhowells@redhat.com \
--cc=dm-devel@redhat.com \
--cc=dsterba@suse.com \
--cc=hare@suse.com \
--cc=jthumshirn@suse.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@redhat.com \
--cc=minwoo.im.dev@gmail.com \
--cc=osandov@fb.com \
--cc=sagi@grimberg.me \
--cc=snitzer@redhat.com \
--cc=song@kernel.org \
--cc=tj@kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).