From mboxrd@z Thu Jan 1 00:00:00 1970 From: Damien Le Moal Subject: Re: [PATCH 04/10] block: nbd: use blk_is_valid_logical_block_size Date: Tue, 21 Jul 2020 11:09:15 +0000 Message-ID: References: <20200721105239.8270-1-mlevitsk@redhat.com> <20200721105239.8270-5-mlevitsk@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Return-path: Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org To: Maxim Levitsky , "linux-kernel@vger.kernel.org" Cc: Keith Busch , Josef Bacik , "open list:BLOCK LAYER" , Sagi Grimberg , Jens Axboe , "open list:NVM EXPRESS DRIVER" , "open list:SCSI CDROM DRIVER" , Tejun Heo , Bart Van Assche , "Martin K. Petersen" , Jason Wang , Maxim Levitsky , Stefan Hajnoczi , Colin Ian King , "Michael S. Tsirkin" , Paolo Bonzini , Ulf Hansson , Ajay Joshi , Ming Lei List-Id: virtualization@lists.linuxfoundation.org On 2020/07/21 19:54, Maxim Levitsky wrote:=0A= > This allows to remove nbd's own check for valid block size=0A= > =0A= > Signed-off-by: Maxim Levitsky =0A= > ---=0A= > drivers/block/nbd.c | 12 ++----------=0A= > 1 file changed, 2 insertions(+), 10 deletions(-)=0A= > =0A= > diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c=0A= > index ce7e9f223b20b..2cd9c4e824f8b 100644=0A= > --- a/drivers/block/nbd.c=0A= > +++ b/drivers/block/nbd.c=0A= > @@ -1347,14 +1347,6 @@ static void nbd_clear_sock_ioctl(struct nbd_device= *nbd,=0A= > nbd_config_put(nbd);=0A= > }=0A= > =0A= > -static bool nbd_is_valid_blksize(unsigned long blksize)=0A= > -{=0A= > - if (!blksize || !is_power_of_2(blksize) || blksize < 512 ||=0A= > - blksize > PAGE_SIZE)=0A= > - return false;=0A= > - return true;=0A= > -}=0A= > -=0A= > static void nbd_set_cmd_timeout(struct nbd_device *nbd, u64 timeout)=0A= > {=0A= > nbd->tag_set.timeout =3D timeout * HZ;=0A= > @@ -1379,7 +1371,7 @@ static int __nbd_ioctl(struct block_device *bdev, s= truct nbd_device *nbd,=0A= > case NBD_SET_BLKSIZE:=0A= > if (!arg)=0A= > arg =3D NBD_DEF_BLKSIZE;=0A= > - if (!nbd_is_valid_blksize(arg))=0A= > + if (!blk_is_valid_logical_block_size(arg))=0A= > return -EINVAL;=0A= > nbd_size_set(nbd, arg,=0A= > div_s64(config->bytesize, arg));=0A= > @@ -1811,7 +1803,7 @@ static int nbd_genl_size_set(struct genl_info *info= , struct nbd_device *nbd)=0A= > bsize =3D nla_get_u64(info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]);=0A= > if (!bsize)=0A= > bsize =3D NBD_DEF_BLKSIZE;=0A= > - if (!nbd_is_valid_blksize(bsize)) {=0A= > + if (!blk_is_valid_logical_block_size(bsize)) {=0A= > printk(KERN_ERR "Invalid block size %llu\n", bsize);=0A= > return -EINVAL;=0A= > }=0A= > =0A= =0A= Looks good to me.=0A= =0A= Reviewed-by: Damien Le Moal =0A= =0A= -- =0A= Damien Le Moal=0A= Western Digital Research=0A=