From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030258AbXEHTn2 (ORCPT ); Tue, 8 May 2007 15:43:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S966679AbXEHTnS (ORCPT ); Tue, 8 May 2007 15:43:18 -0400 Received: from mx1.redhat.com ([66.187.233.31]:47681 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966419AbXEHTnP (ORCPT ); Tue, 8 May 2007 15:43:15 -0400 Date: Tue, 8 May 2007 20:40:15 +0100 From: Alasdair G Kergon To: Andrew Morton Cc: dm-devel@redhat.com, Neil Brown Subject: [2.6.22 PATCH 01/26] dm: merge max_hw_sector Message-ID: <20070508194015.GH24114@agk.fab.redhat.com> Mail-Followup-To: Andrew Morton , dm-devel@redhat.com, Neil Brown Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i Organization: Red Hat UK Ltd. Registered in England and Wales, number 04098903. Registered Office: Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE. Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: Neil Brown Make sure dm honours max_hw_sectors of underlying devices Signed-off-by: Neil Brown Signed-off-by: Alasdair G Kergon --- ### Diffstat output drivers/md/dm-table.c | 9 +++++++++ include/linux/device-mapper.h | 1 + 2 files changed, 10 insertions(+) Index: linux-2.6.21/drivers/md/dm-table.c =================================================================== --- linux-2.6.21.orig/drivers/md/dm-table.c 2007-05-01 17:38:32.000000000 +0100 +++ linux-2.6.21/drivers/md/dm-table.c 2007-05-01 17:40:45.000000000 +0100 @@ -99,6 +99,9 @@ static void combine_restrictions_low(str lhs->max_segment_size = min_not_zero(lhs->max_segment_size, rhs->max_segment_size); + lhs->max_hw_sectors = + min_not_zero(lhs->max_hw_sectors, rhs->max_hw_sectors); + lhs->seg_boundary_mask = min_not_zero(lhs->seg_boundary_mask, rhs->seg_boundary_mask); @@ -561,6 +564,9 @@ void dm_set_device_limits(struct dm_targ rs->max_segment_size = min_not_zero(rs->max_segment_size, q->max_segment_size); + rs->max_hw_sectors = + min_not_zero(rs->max_hw_sectors, q->max_hw_sectors); + rs->seg_boundary_mask = min_not_zero(rs->seg_boundary_mask, q->seg_boundary_mask); @@ -696,6 +702,8 @@ static void check_for_valid_limits(struc { if (!rs->max_sectors) rs->max_sectors = SAFE_MAX_SECTORS; + if (!rs->max_hw_sectors) + rs->max_hw_sectors = SAFE_MAX_SECTORS; if (!rs->max_phys_segments) rs->max_phys_segments = MAX_PHYS_SEGMENTS; if (!rs->max_hw_segments) @@ -889,6 +897,7 @@ void dm_table_set_restrictions(struct dm q->max_hw_segments = t->limits.max_hw_segments; q->hardsect_size = t->limits.hardsect_size; q->max_segment_size = t->limits.max_segment_size; + q->max_hw_sectors = t->limits.max_hw_sectors; q->seg_boundary_mask = t->limits.seg_boundary_mask; if (t->limits.no_cluster) q->queue_flags &= ~(1 << QUEUE_FLAG_CLUSTER); Index: linux-2.6.21/include/linux/device-mapper.h =================================================================== --- linux-2.6.21.orig/include/linux/device-mapper.h 2007-05-01 17:38:32.000000000 +0100 +++ linux-2.6.21/include/linux/device-mapper.h 2007-05-01 17:40:45.000000000 +0100 @@ -115,6 +115,7 @@ struct io_restrictions { unsigned short max_hw_segments; unsigned short hardsect_size; unsigned int max_segment_size; + unsigned int max_hw_sectors; unsigned long seg_boundary_mask; unsigned char no_cluster; /* inverted so that 0 is default */ };