From: Shaohua Li <shli@kernel.org>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: "axboe@kernel.dk" <axboe@kernel.dk>, Vivek Goyal <vgoyal@redhat.com>
Subject: [patch]blk: use correct sectors limitation for discard request
Date: Fri, 16 Mar 2012 15:40:06 +0800 [thread overview]
Message-ID: <4F62EE56.6000702@kernel.org> (raw)
Subject: blk: use correct sectors limitation for discard request
max_discard_sectors doesn't equal to max_sectors/max_hw_sectors. Without
this,
discard request merge might be ignored.
Signed-off-by: Shaohua Li <shli@fusionio.com>
---
block/blk-merge.c | 13 ++++++++-----
include/linux/blkdev.h | 5 +++++
2 files changed, 13 insertions(+), 5 deletions(-)
Index: linux/block/blk-merge.c
===================================================================
--- linux.orig/block/blk-merge.c 2012-03-14 09:53:15.574255985 +0800
+++ linux/block/blk-merge.c 2012-03-14 11:06:01.504462095 +0800
@@ -228,9 +228,11 @@ no_merge:
int ll_back_merge_fn(struct request_queue *q, struct request *req,
struct bio *bio)
{
- unsigned short max_sectors;
+ unsigned int max_sectors;
- if (unlikely(req->cmd_type == REQ_TYPE_BLOCK_PC))
+ if (unlikely(req->cmd_flags & REQ_DISCARD))
+ max_sectors = queue_max_discard_sectors(q);
+ else if (unlikely(req->cmd_type == REQ_TYPE_BLOCK_PC))
max_sectors = queue_max_hw_sectors(q);
else
max_sectors = queue_max_sectors(q);
@@ -252,14 +254,15 @@ int ll_back_merge_fn(struct request_queu
int ll_front_merge_fn(struct request_queue *q, struct request *req,
struct bio *bio)
{
- unsigned short max_sectors;
+ unsigned int max_sectors;
- if (unlikely(req->cmd_type == REQ_TYPE_BLOCK_PC))
+ if (unlikely(req->cmd_flags & REQ_DISCARD))
+ max_sectors = queue_max_discard_sectors(q);
+ else if (unlikely(req->cmd_type == REQ_TYPE_BLOCK_PC))
max_sectors = queue_max_hw_sectors(q);
else
max_sectors = queue_max_sectors(q);
-
if (blk_rq_sectors(req) + bio_sectors(bio) > max_sectors) {
req->cmd_flags |= REQ_NOMERGE;
if (req == q->last_merge)
Index: linux/include/linux/blkdev.h
===================================================================
--- linux.orig/include/linux/blkdev.h 2012-03-14 10:17:19.523960440 +0800
+++ linux/include/linux/blkdev.h 2012-03-14 10:57:22.324465357 +0800
@@ -1006,6 +1006,11 @@ static inline unsigned int queue_max_hw_
return q->limits.max_hw_sectors;
}
+static inline unsigned int queue_max_discard_sectors(struct
request_queue *q)
+{
+ return q->limits.max_discard_sectors;
+}
+
static inline unsigned short queue_max_segments(struct request_queue *q)
{
return q->limits.max_segments;
next reply other threads:[~2012-03-16 7:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-16 7:40 Shaohua Li [this message]
2012-03-20 16:31 ` [patch]blk: use correct sectors limitation for discard request Vivek Goyal
2012-03-21 1:26 ` Shaohua Li
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=4F62EE56.6000702@kernel.org \
--to=shli@kernel.org \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=vgoyal@redhat.com \
/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).