From: NeilBrown <neilb@suse.de>
Date: Tue, 1 Jun 2010 09:37:28 +0000 (+1000)
Subject: raid5: Don't set read-ahead when there is no queue
X-Git-Tag: v2.6.36-rc1~280^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a5add49951e698073011855d1a8a7306bc9308d;p=pandora-kernel.git

raid5: Don't set read-ahead when there is no queue

dm-raid456 does not provide a 'queue' for raid5 to use,
so we must make raid5 stop depending on the queue.

First: read_ahead
dm handles read-ahead adjustment fully in userspace, so
simply don't do any readahead adjustments if there is
no queue.

Also re-arrange code slightly so all the accesses to ->queue are
together.

Finally, move the blk_queue_merge_bvec function into the 'if' as
the ->split_io setting in dm-raid456 has the same effect.

Signed-off-by: NeilBrown <neilb@suse.de>
---

Reading git-diff-tree failed