From nobody Fri Dec 19 13:39:51 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5220C18AE4 for ; Tue, 27 Aug 2024 03:22:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724728956; cv=none; b=dd8yCm0niRp2jJZ/jY7Kp4BpA4+isBaKN3bKfkLwJgSiM1LqVJpsTbcG1m3ClairMvcpASqzHUl3Kv+UCP2egEFu4JYx5sYg3SSQ5cP8X21OsbD8rSIQ7Jrtgawd32U6iISXbsi+t3DxjYGz6gQEM1u4EqlnGAIv7z8ULkO7Ygg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724728956; c=relaxed/simple; bh=/D2vwv/64+Wo6vRiH+gmdk/WGQELlQ8jiYn+frqm9cg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ZuoBTDvIGADr+3b7kk/r7e4jXPlQLRO0tCBMXbi09urH/oaQoWCcxj8L0cvs8LhsW2hwuuEMzVJPlhrrTSw1upEaftHym1KY2aG6elILVt3viHXG1yJ6i+BWiE6YW2Oax2yjcKw45noDsCFsm1JFIaslyNjDNmzaFnM+c4HuSXA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=U3M/7EXu; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="U3M/7EXu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724728953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=WJP8yFKVfmMC38Dqp+UxkP7D8GdYask1IZvdrXmNh4s=; b=U3M/7EXuqtLKM0ztAy7DkXRhQ4bI9di062D00jqiHBjj19N9tyYkSNP+eKxSkL8zjeUgdE 0CPSq9ul52fd1aWvzCHe5k+veuFPiYVC91PMGWNZK5YveGOzQRsENZL4ZdtBHzEDq8rAuV 2VIJpllCqXzWtOsic2ZAU2bS6Nanbtg= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-222-chjdbgOHPlGVwVBpb2OtLg-1; Mon, 26 Aug 2024 23:22:29 -0400 X-MC-Unique: chjdbgOHPlGVwVBpb2OtLg-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 01FEA1955F40; Tue, 27 Aug 2024 03:22:28 +0000 (UTC) Received: from dell-per7425-02.rhts.eng.pek2.redhat.com (dell-per7425-02.rhts.eng.pek2.redhat.com [10.73.116.18]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 10EDB3001FC3; Tue, 27 Aug 2024 03:22:23 +0000 (UTC) From: Li Wang To: linux-kernel@vger.kernel.org, ltp@lists.linux.it Cc: Jan Stancek , John Garry , Damien Le Moal , Stefan Hajnoczi Subject: [PATCH] loop: Increase bsize variable from unsigned short to unsigned int Date: Tue, 27 Aug 2024 11:22:18 +0800 Message-ID: <20240827032218.34744-1-liwang@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Content-Type: text/plain; charset="utf-8" This change allows the loopback driver to handle larger block sizes and increases the consistency of data types used within the driver. Especially to mactch the struct queue_limits.logical_block_size type. Also, this is to get rid of the LTP/ioctl_loop06 test failure: 12 ioctl_loop06.c:76: TINFO: Using LOOP_SET_BLOCK_SIZE with arg > PAGE_SI= ZE 13 ioctl_loop06.c:59: TFAIL: Set block size succeed unexpectedly ... 18 ioctl_loop06.c:76: TINFO: Using LOOP_CONFIGURE with block_size > PAGE_= SIZE 19 ioctl_loop06.c:59: TFAIL: Set block size succeed unexpectedly Link: https://lists.linux.it/pipermail/ltp/2024-August/039912.html Signed-off-by: Li Wang Cc: Jan Stancek Cc: John Garry Cc: Damien Le Moal Cc: Stefan Hajnoczi Reviewed-by: Damien Le Moal Reviewed-by: Jan Stancek --- drivers/block/loop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 78a7bb28defe..86cc3b19faae 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -173,7 +173,7 @@ static loff_t get_loop_size(struct loop_device *lo, str= uct file *file) static bool lo_bdev_can_use_dio(struct loop_device *lo, struct block_device *backing_bdev) { - unsigned short sb_bsize =3D bdev_logical_block_size(backing_bdev); + unsigned int sb_bsize =3D bdev_logical_block_size(backing_bdev); =20 if (queue_logical_block_size(lo->lo_queue) < sb_bsize) return false; @@ -977,7 +977,7 @@ loop_set_status_from_info(struct loop_device *lo, return 0; } =20 -static unsigned short loop_default_blocksize(struct loop_device *lo, +static unsigned int loop_default_blocksize(struct loop_device *lo, struct block_device *backing_bdev) { /* In case of direct I/O, match underlying block size */ @@ -986,7 +986,7 @@ static unsigned short loop_default_blocksize(struct loo= p_device *lo, return SECTOR_SIZE; } =20 -static int loop_reconfigure_limits(struct loop_device *lo, unsigned short = bsize) +static int loop_reconfigure_limits(struct loop_device *lo, unsigned int bs= ize) { struct file *file =3D lo->lo_backing_file; struct inode *inode =3D file->f_mapping->host; --=20 2.46.0