From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 29 Oct 2013 18:11:47 +0000 (-0600)
Subject: blk-mq: don't disallow request merges for req->special being set
X-Git-Tag: v3.13-rc1~101^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7e245000110a7794de8f925b9edc06a9c852f80;p=pandora-kernel.git

blk-mq: don't disallow request merges for req->special being set

For blk-mq, if a driver has requested per-request payload data
to carry command structures, they are stuffed into req->special.
For an old style request based driver, req->special is used
for the same purpose but indicates that a per-driver request
structure has been prepared for the request already. So for the
old style driver, we do not merge such requests.

As most/all blk-mq drivers will use the payload feature, and
since we have no problem merging on these, make this check
dependent on whether it's a blk-mq enabled driver or not.

Reported-by: Shaohua Li <shli@fusionio.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

Reading git-diff-tree failed