From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752550AbbKOCF6 (ORCPT ); Sat, 14 Nov 2015 21:05:58 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:35168 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752157AbbKOCEu (ORCPT ); Sat, 14 Nov 2015 21:04:50 -0500 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Jes Sorensen" , "NeilBrown" Date: Sun, 15 Nov 2015 01:45:45 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.2 16/60] md/raid0: apply base queue limits *before* disk_stack_limits In-Reply-To: X-SA-Exim-Connect-IP: 192.168.4.247 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.2.73-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: NeilBrown commit 66eefe5de11db1e0d8f2edc3880d50e7c36a9d43 upstream. Calling e.g. blk_queue_max_hw_sectors() after calls to disk_stack_limits() discards the settings determined by disk_stack_limits(). So we need to make those calls first. Fixes: 199dc6ed5179 ("md/raid0: update queue parameter in a safer location.") Reported-by: Jes Sorensen Signed-off-by: NeilBrown [bwh: Backported to 3.2: the code being moved looks a little different] Signed-off-by: Ben Hutchings --- --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c @@ -358,16 +358,17 @@ static int raid0_run(struct mddev *mddev } conf = mddev->private; - list_for_each_entry(rdev, &mddev->disks, same_set) { - disk_stack_limits(mddev->gendisk, rdev->bdev, - rdev->data_offset << 9); - } blk_queue_max_hw_sectors(mddev->queue, mddev->chunk_sectors); blk_queue_io_min(mddev->queue, mddev->chunk_sectors << 9); blk_queue_io_opt(mddev->queue, (mddev->chunk_sectors << 9) * mddev->raid_disks); + list_for_each_entry(rdev, &mddev->disks, same_set) { + disk_stack_limits(mddev->gendisk, rdev->bdev, + rdev->data_offset << 9); + } + /* calculate array device size */ md_set_array_sectors(mddev, raid0_size(mddev, 0, 0));