From: Jens Axboe <axboe@kernel.dk>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org
Subject: Re: [PATCH 1/2] block: fix blk_abort_request on blk-mq
Date: Mon, 22 Sep 2014 08:08:19 -0600 [thread overview]
Message-ID: <54202D53.4090202@kernel.dk> (raw)
In-Reply-To: <1411394371-16254-2-git-send-email-hch@lst.de>
On 2014-09-22 07:59, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> block/blk-mq.c | 2 +-
> block/blk-timeout.c | 5 ++++-
> block/blk.h | 2 ++
> 3 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/block/blk.h b/block/blk.h
> index e515a28..159e973 100644
> --- a/block/blk.h
> +++ b/block/blk.h
> @@ -250,4 +250,6 @@ static inline int blk_throtl_init(struct request_queue *q) { return 0; }
> static inline void blk_throtl_exit(struct request_queue *q) { }
> #endif /* CONFIG_BLK_DEV_THROTTLING */
>
> +extern void blk_mq_rq_timed_out(struct request *req, bool reserved);
Moving this to blk-mq.h.
Applied.
--
Jens Axboe
next prev parent reply other threads:[~2014-09-22 14:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-22 13:59 two more fixes for block/for-linus Christoph Hellwig
2014-09-22 13:59 ` [PATCH 1/2] block: fix blk_abort_request on blk-mq Christoph Hellwig
2014-09-22 14:08 ` Jens Axboe [this message]
2014-09-22 13:59 ` [PATCH 2/2] scsi: move blk_mq_start_request call earlier Christoph Hellwig
2014-09-22 14:06 ` two more fixes for block/for-linus Jens Axboe
2014-09-22 18:40 ` Douglas Gilbert
2014-09-23 5:56 ` Christoph Hellwig
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=54202D53.4090202@kernel.dk \
--to=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.