From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 2A3A02110E; Tue, 27 May 2025 17:36:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748367374; cv=none; b=qzthnVro2HRtUP9M1WV7RDdC1z3BpBV5yy++sWBakdqw/ptWTEoDqn7MgAtBir3TNreE/MG1qtxRL2mW3wM05u1HpJIIECwBNi0dgfiFUqBWaDpo0qBinsRSBZn8PqKn/RIdb6z8MgVrWTNFzpr6HEJYEScQLsYELyoD95D7Ti0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748367374; c=relaxed/simple; bh=2zqz0os9C+R3q0e71jY7X/akPCT0h59JzpMpoIjapJg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dYXNJdUDjGZM10PZ0pygLo/cWYcFCE9qRxTFTb9dcIQgllnKtpLqUecFxyzWVI21Ah83yDZIJM67E+ORCcl+E9CPG1WUwkNAHJNiVTgUKahPGYLAJO6VnWa9tFV19/LeMDoCwVp/oyLfPGYASX+AAjd8usOHPVCXMOzbGBRgT+w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=O/NGscIR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="O/NGscIR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 378B1C4CEE9; Tue, 27 May 2025 17:36:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748367373; bh=2zqz0os9C+R3q0e71jY7X/akPCT0h59JzpMpoIjapJg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O/NGscIR4XitTXZOiAnU9wlE9m7Z7cEeJiB91sish5h2ekbUsaY1CmOselRhYwDAU InvVtY0Ie/PhrigGlCP5CqOTwyY6ycFRTOeO3PfR9tWETrxuSLPWaCaJ82fqAtJvwv vnMNDUDHFKblU4fepBOLc4LNYvfrSZ/OsZYWZO2A= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christoph Hellwig , Damien Le Moal , Jens Axboe , Sasha Levin Subject: [PATCH 6.14 366/783] loop: check in LO_FLAGS_DIRECT_IO in loop_default_blocksize Date: Tue, 27 May 2025 18:22:43 +0200 Message-ID: <20250527162527.985211800@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162513.035720581@linuxfoundation.org> References: <20250527162513.035720581@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christoph Hellwig [ Upstream commit f6f9e32fe1e454ae8ac0190b2c2bd6074914beec ] We can't go below the minimum direct I/O size no matter if direct I/O is enabled by passing in an O_DIRECT file descriptor or due to the explicit flag. Now that LO_FLAGS_DIRECT_IO is set earlier after assigning a backing file, loop_default_blocksize can check it instead of the O_DIRECT flag to handle both conditions. Signed-off-by: Christoph Hellwig Reviewed-by: Damien Le Moal Link: https://lore.kernel.org/r/20250131120120.1315125-4-hch@lst.de Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/loop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 1e5ef09cdde68..f68f86e9cb716 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -920,7 +920,7 @@ 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 */ - if ((lo->lo_backing_file->f_flags & O_DIRECT) && backing_bdev) + if ((lo->lo_flags & LO_FLAGS_DIRECT_IO) && backing_bdev) return bdev_logical_block_size(backing_bdev); return SECTOR_SIZE; } -- 2.39.5