Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753837AbdC1CMM (ORCPT ); Mon, 27 Mar 2017 22:12:12 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:33017 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752853AbdC1CMK (ORCPT ); Mon, 27 Mar 2017 22:12:10 -0400 To: Fam Zheng Cc: linux-kernel@vger.kernel.org, "Martin K. Petersen" , linux-scsi@vger.kernel.org, "James E.J. Bottomley" Subject: Re: [PATCH] sd: Consider max_xfer_blocks if opt_xfer_blocks is unusable From: "Martin K. Petersen" Organization: Oracle Corporation References: <20170327141831.20936-1-famz@redhat.com> Date: Mon, 27 Mar 2017 22:11:59 -0400 In-Reply-To: <20170327141831.20936-1-famz@redhat.com> (Fam Zheng's message of "Mon, 27 Mar 2017 22:18:31 +0800") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 540 Lines: 20 Fam Zheng writes: Hi Fam, > --- a/drivers/scsi/sd.c > +++ b/drivers/scsi/sd.c > @@ -2957,6 +2957,7 @@ static int sd_revalidate_disk(struct gendisk *disk) > rw_max = logical_to_sectors(sdp, sdkp->opt_xfer_blocks); > } else > rw_max = BLK_DEF_MAX_SECTORS; > + rw_max = min_not_zero(rw_max, dev_max); rw_max is in sectors, dev_max is in logical blocks. > > /* Combine with controller limits */ > q->limits.max_sectors = min(rw_max, queue_max_hw_sectors(q)); -- Martin K. Petersen Oracle Linux Engineering