public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jens Axboe <axboe@kernel.dk>
To: Tejun Heo <tj@kernel.org>
Cc: Shaohua Li <shaohua.li@intel.com>,
	Vivek Goyal <vgoyal@redhat.com>,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH block/for-linus 1/2] block: separate out blk_rq_merge_ok() and blk_try_merge() from elevator functions
Date: Wed, 08 Feb 2012 09:20:13 +0100	[thread overview]
Message-ID: <4F32303D.9090003@kernel.dk> (raw)
In-Reply-To: <20120207230153.GK21292@google.com>

On 02/08/2012 12:01 AM, Tejun Heo wrote:
> blk_rq_merge_ok() is the elevator-neutral part of merge eligibility
> test.  blk_try_merge() determines merge direction and expects the
> caller to have tested elv_rq_merge_ok() previously.
> 
> elv_rq_merge_ok() now wraps blk_rq_merge_ok() and then calls
> elv_iosched_allow_merge().  elv_try_merge() is removed and the two
> callers are updated to call elv_rq_merge_ok() explicitly followed by
> blk_try_merge().  While at it, make rq_merge_ok() functions return
> bool.
> 
> This is to prepare for plug merge update and doesn't introduce any
> behavior change.
> 
> This is based on Jens' patch to skip elevator_allow_merge_fn() from
> plug merge.

Thanks for finishing it up and testing, I have applied both patches.

-- 
Jens Axboe


      parent reply	other threads:[~2012-02-08  8:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-07 23:01 [PATCH block/for-linus 1/2] block: separate out blk_rq_merge_ok() and blk_try_merge() from elevator functions Tejun Heo
2012-02-07 23:02 ` [PATCH block/for-linus 2/2] block: don't call elevator callbacks for plug merges Tejun Heo
2012-02-08  8:20 ` Jens Axboe [this message]

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=4F32303D.9090003@kernel.dk \
    --to=axboe@kernel.dk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=shaohua.li@intel.com \
    --cc=tj@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