From: Martin K. Petersen <martin.petersen@oracle.com>
Date: Tue, 18 Sep 2012 16:19:25 +0000 (-0400)
Subject: block: Clean up special command handling logic
X-Git-Tag: v3.7-rc1~54^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2a60da74fc8215c68509a89e9a69c66363153db;p=pandora-kernel.git

block: Clean up special command handling logic

Remove special-casing of non-rw fs style requests (discard). The nomerge
flags are consolidated in blk_types.h, and rq_mergeable() and
bio_mergeable() have been modified to use them.

bio_is_rw() is used in place of bio_has_data() a few places. This is
done to to distinguish true reads and writes from other fs type requests
that carry a payload (e.g. write same).

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Acked-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

Reading git-diff-tree failed