Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: ku4Iy5afuPNUIj5oO5yNgwUUGYHGMiWnjYeItw3gGUyKXFKv2CEvurlhaWAtMdJUEyGFd3FrUu
 na7HaKvkqDeiaoKs256xfbZQTB1oa05VCRdRcdkAKr0c7txDmZwsGZRnUTajXncWLvKI1N6woq
 y79QiAAdCG4RkVrkv3joCerL5aqt6g56eGEfIMOsyTZK8dvmWASmhvljLuMxEEAN0xhhAJpdNp
 1TupQe2a7sCqve8mQ5ASmasp9e2AZiCXoI5cJWLhB0seXwmKbL0AP8U0FFPVZKOCygU6IbFvb4
 qds=
From:   Damien Le Moal <Damien.LeMoal@wdc.com>
To:     Maxim Levitsky <mlevitsk@redhat.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Keith Busch <kbusch@kernel.org>,
        Josef Bacik <josef@toxicpanda.com>,
        "open list:BLOCK LAYER" <linux-block@vger.kernel.org>,
        Sagi Grimberg <sagi@grimberg.me>, Jens Axboe <axboe@kernel.dk>,
        "open list:NVM EXPRESS DRIVER" <linux-nvme@lists.infradead.org>,
        "open list:SCSI CDROM DRIVER" <linux-scsi@vger.kernel.org>,
        Tejun Heo <tj@kernel.org>,
        Bart Van Assche <bvanassche@acm.org>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        Jason Wang <jasowang@redhat.com>,
        Maxim Levitsky <maximlevitsky@gmail.com>,
        Stefan Hajnoczi <stefanha@redhat.com>,
        Colin Ian King <colin.king@canonical.com>,
        "Michael S. Tsirkin" <mst@redhat.com>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Ulf Hansson <ulf.hansson@linaro.org>,
        Ajay Joshi <Ajay.Joshi@wdc.com>,
        Ming Lei <ming.lei@redhat.com>,
        "open list:SONY MEMORYSTICK SUBSYSTEM" <linux-mmc@vger.kernel.org>,
        Christoph Hellwig <hch@lst.de>,
        Satya Tangirala <satyat@google.com>,
        "open list:NETWORK BLOCK DEVICE (NBD)" <nbd@other.debian.org>,
        Hou Tao <houtao1@huawei.com>, Jens Axboe <axboe@fb.com>,
        "open list:VIRTIO CORE AND NET DRIVERS" 
        <virtualization@lists.linux-foundation.org>,
        "James E.J. Bottomley" <jejb@linux.ibm.com>,
        Alex Dubov <oakad@yahoo.com>
Subject: Re: [PATCH 10/10] block: scsi: sr: use
 blk_is_valid_logical_block_size
Thread-Topic: [PATCH 10/10] block: scsi: sr: use
 blk_is_valid_logical_block_size
Thread-Index: AQHWX019CvZXuI6pdEKIdYQL4AgTSA==
Date:   Tue, 21 Jul 2020 11:29:48 +0000
Message-ID: <CY4PR04MB37517861074A4A448180E136E7780@CY4PR04MB3751.namprd04.prod.outlook.com>
References: <20200721105239.8270-1-mlevitsk@redhat.com>
 <20200721105239.8270-11-mlevitsk@redhat.com>
Accept-Language: en-US
Content-Language: en-US
wdcipoutbound: EOP-TRUE
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 0e8bc580-4ae2-44df-5ee3-08d82d696040
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jul 2020 11:29:48.0203
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: gLY8pDDRMak6fdLiSqc0WgUr6sksn8NLB+shZ9kjcrQnUw+7YG+THc36s4RUmGX+QKRZ0h91ZSsBzn5Gs2UaZg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB1176
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2020/07/21 19:55, Maxim Levitsky wrote:=0A=
> Plus some tiny refactoring.=0A=
> =0A=
> Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>=0A=
> ---=0A=
>  drivers/scsi/sr.c | 31 +++++++++++++------------------=0A=
>  1 file changed, 13 insertions(+), 18 deletions(-)=0A=
> =0A=
> diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c=0A=
> index 0c4aa4665a2f9..0e96338029310 100644=0A=
> --- a/drivers/scsi/sr.c=0A=
> +++ b/drivers/scsi/sr.c=0A=
> @@ -866,31 +866,26 @@ static void get_sectorsize(struct scsi_cd *cd)=0A=
>  			cd->capacity =3D max_t(long, cd->capacity, last_written);=0A=
>  =0A=
>  		sector_size =3D get_unaligned_be32(&buffer[4]);=0A=
> -		switch (sector_size) {=0A=
> -			/*=0A=
> -			 * HP 4020i CD-Recorder reports 2340 byte sectors=0A=
> -			 * Philips CD-Writers report 2352 byte sectors=0A=
> -			 *=0A=
> -			 * Use 2k sectors for them..=0A=
> -			 */=0A=
> -		case 0:=0A=
> -		case 2340:=0A=
> -		case 2352:=0A=
> +=0A=
> +		/*=0A=
> +		 * HP 4020i CD-Recorder reports 2340 byte sectors=0A=
> +		 * Philips CD-Writers report 2352 byte sectors=0A=
> +		 *=0A=
> +		 * Use 2k sectors for them..=0A=
> +		 */=0A=
> +=0A=
=0A=
No need for the blank line here.=0A=
=0A=
> +		if (!sector_size || sector_size =3D=3D 2340 || sector_size =3D=3D 2352=
)=0A=
>  			sector_size =3D 2048;=0A=
> -			/* fall through */=0A=
> -		case 2048:=0A=
> -			cd->capacity *=3D 4;=0A=
> -			/* fall through */=0A=
> -		case 512:=0A=
> -			break;=0A=
> -		default:=0A=
> +=0A=
> +		cd->capacity *=3D (sector_size >> SECTOR_SHIFT);=0A=
=0A=
Where does this come from ? There is no such code in sr get_sectorsize()...=
=0A=
=0A=
> +=0A=
> +		if (!blk_is_valid_logical_block_size(sector_size)) {=0A=
>  			sr_printk(KERN_INFO, cd,=0A=
>  				  "unsupported sector size %d.", sector_size);=0A=
>  			cd->capacity =3D 0;=0A=
>  		}=0A=
>  =0A=
>  		cd->device->sector_size =3D sector_size;=0A=
> -=0A=
=0A=
White line change.=0A=
=0A=
>  		/*=0A=
>  		 * Add this so that we have the ability to correctly gauge=0A=
>  		 * what the device is capable of.=0A=
> =0A=
=0A=
=0A=
-- =0A=
Damien Le Moal=0A=
Western Digital Research=0A=