From patchwork Thu Apr 10 01:49:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 14045747 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E675C369A6 for ; Thu, 10 Apr 2025 01:50:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 17F9D6B024C; Wed, 9 Apr 2025 21:49:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AE60C6B0280; Wed, 9 Apr 2025 21:49:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 890B96B02A4; Wed, 9 Apr 2025 21:49:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 38CCC6B024F for ; Wed, 9 Apr 2025 21:49:57 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5D8A45B91D for ; Thu, 10 Apr 2025 01:49:58 +0000 (UTC) X-FDA: 83316453276.16.532868C Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf27.hostedemail.com (Postfix) with ESMTP id 151DF40007 for ; Thu, 10 Apr 2025 01:49:55 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=R26qRIYk; spf=none (imf27.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=quarantine) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744249796; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+ZrhLZCm8tm/ew0QWyWZbWu1XvI3GATXCgCuKoXd9Bk=; b=6WhzGBEGFj7JwZU+2ChFQi+hvyPxejlb2Z8xt7Eazs48mIwP55n8EvfA1lFUJLSojELdBe rs0b0A9+igu6et86cN2XtOuDrctaVygEKD2CcwGDBWsGdmZtXJZdYDEA1Lrs3rbQvplxF6 Y4CStNGOb3UAE4jV8X85T60C0EfKBWk= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=R26qRIYk; spf=none (imf27.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=quarantine) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744249796; a=rsa-sha256; cv=none; b=j7gUKLzmq9kLOiALPtfD+dTgMfGqONG0Po3aebD4JNiZOWlSJMPhB1KRfwfVEzv+I1xDEb rk3nvdW4yh7zkwiuR7lJ6rKVP9dB+BO0xGY6gEWX7V+MiiLGKIkKGtw+ZcQ0RtxfT+ROij Y5gQB92eYCKxBQkIwWCxqh1QZLlkntI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=+ZrhLZCm8tm/ew0QWyWZbWu1XvI3GATXCgCuKoXd9Bk=; b=R26qRIYkXu0Z3b41jJAv/FgCEj 5Fz5zYumTTbKmUt+n0M/Y2qgsSkKGqiYMVYHQ29n1yoaKcyHxy1Ewjv/RG5lzQG8KQcgLDrrCvriD 9SAkHIK+HG+MCxJyh9NrYIyTPtgf72uG/3nOjjBXM8nijBwDcAcGZxztjJyNqN9u+GeTe4iSEqBbh /MohfrhorRHSbEqcCF3FSpEQOPzGBRol+BXc1dLRMa7hLfJNZ7+7YHy8AAJOxd0T7eZFR2G1fAcsv hs6YeBJqb6Z/nxrgkNXDpvLGd5on0WMn2dNqIKRY88dYoauT2Q+Nbbxj/FJYQ+uYvr5BJ0dJbGmN0 +jP/BxDw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.98.2 #2 (Red Hat Linux)) id 1u2h35-00000008yvM-3pIY; Thu, 10 Apr 2025 01:49:47 +0000 From: Luis Chamberlain To: brauner@kernel.org, jack@suse.cz, tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, riel@surriel.com Cc: dave@stgolabs.net, willy@infradead.org, hannes@cmpxchg.org, oliver.sang@intel.com, david@redhat.com, axboe@kernel.dk, hare@suse.de, david@fromorbit.com, djwong@kernel.org, ritesh.list@gmail.com, linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org, gost.dev@samsung.com, p.raghav@samsung.com, da.gomez@samsung.com, mcgrof@kernel.org Subject: [PATCH v2 4/8] fs/ocfs2: use sleeping version of __find_get_block() Date: Wed, 9 Apr 2025 18:49:41 -0700 Message-ID: <20250410014945.2140781-5-mcgrof@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250410014945.2140781-1-mcgrof@kernel.org> References: <20250410014945.2140781-1-mcgrof@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 151DF40007 X-Stat-Signature: fw74ebfy1au9ohn8udyys3nof6cwrbem X-Rspamd-Pre-Result: action=add header; module=dmarc; Action set by DMARC X-Rspam: Yes X-HE-Tag: 1744249795-762267 X-HE-Meta: U2FsdGVkX19Zlb63UcaJpl8QGDGdLAfaq+DXTpUnNtQwCTcAi4AnkCQZrzd45diE13GW545j1bJiouwTOJYTqmOs8oJNXM1+b3FG/zynvsaVoJvDrJb0u0Iq+/acKQrScLaLb3vHQMVsrz3dS2FvOszP96hQRkuaZMtpyRTEx2a6C20555nTtjXjLpprc6qG1/B94qJOFt22kV6O4Gzeq95bJUVG3zNK8JkOK3ZYaz+JI+A8p002FDQ5MgN7QtKITAGKrcs5sF44St/8/wvoSntcmC3779VR9fYF/ceIFf6e35TFeMuANr6B1frNpTFRRLDUAswJZ3Gi/HWV4s7TbhTzx57axjoB2MjG2LTnHv3P3TqrhbOLJUpOThKa5l8C9TdgmAhNnvJAcERx8XXTBerdl+r439gpjLNLqlmwK2TPc8jdctqV71lCvHl+qdezOZxQDNL+jmHBWXa2KjPhM2fhQs+CLz/r6bhKnKOPB9tPYbTq4Fv5Fw61Xq/t/k3Bg/F+Nx35Nk8U8SbrtEb2qUwvv86w0WGbXCHJIHxx0QExXRP9Hd1kF0TkyVrYVrGtT1rxtgBWY2WP3Wz4CRK8YTUfG5IEYLzjG7s3llmjCu53VqrtB5MYnn9ze+QBWBUz8FCmtH162bjqrXoqf7NlJpF684LlaE8J6lldFIpMvjl6FpWiKWXYRV22xZS937hsj+7CgLhvpHWLRSC5Sz5aLbKxI6FLyXr/rAiF22x5UVKyP1m7aoDbXnd20JlnO2VWMzRAeKjGfP2R5MsoT8xpctQFB47Rk+ipV8xPCvpW1mGSSJr0eBRyFRlReR88+aIOC/dtus67lQtL9FQsH9YvbmzJWI6wDqh6rHbR5hq9WMQwBj/pBuctK5/TXxnDYRB1EN8D3AycUFJ9uM46eFDk5gOa7o5yIGVwXpom9gPguKDF6t0Mnrp4b/lfLM4nXuVInSos/RcGVKG6hZ5fgRF 6kCfrRwf k3k9dzFkdgoHeIrJoY2FJCaBNdKSVOb0Wpbv7S4X03rLy8U4vDMRPJJmxRuEkQFUYFjwAFADX2dMgQS5JWBQwW+Unpq5wlspMfZf6HKbiqLi8MHZjtahxyvy8xbv5ZhPoHiKpQopfquLVGi61d7rIX4gtracHz9I95fLShDQQ856bzb5our0a8JBqVADWFXYoCz4nv6bFL7wu3R9tMFh7NsKp4Pghzed4+PGFbQBIARmONP8yiZdUarbZ2zzss3Y+t6yRgbPzscN4nV1YdZ0GK0LNHhCOsarFGEtGOkYr7f8raB5uRxPMnkG/kAx7T6NuUmX4gwlt6rWRH04beNJYdIgcqoFZVGM/wbKOqBycif5xIZY0G+ud84ndOUZFx5FxnmpfdooWeWUQ/s/AlJig4SnS3sybIcTj8MIhMFov5+nXVlrU1krIcDTb2XT3wLvIYHmEhsERkmQ67U9TqD1suq4HZFK4JgfYtpbfgWUJdp/7pj+fD7GOSeCVaRCI2uS5oWO8Jy+2xkbJER01MQEDuMLjXOlXfwmPRafYi/zDQhPYMhK2H3mNeyeX3ngIkphOYfyvA/9m/OfZCkZqVKTArg6u3XLIgajZqodi X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Davidlohr Bueso This is a path that allows for blocking as it does IO. Convert to the new nonatomic flavor to benefit from potential performance benefits and adapt in the future vs migration such that semantics are kept. Suggested-by: Jan Kara Signed-off-by: Davidlohr Bueso Signed-off-by: Luis Chamberlain --- fs/ocfs2/journal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index f1b4b3e611cb..c7a9729dc9d0 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -1249,7 +1249,7 @@ static int ocfs2_force_read_journal(struct inode *inode) } for (i = 0; i < p_blocks; i++, p_blkno++) { - bh = __find_get_block(osb->sb->s_bdev, p_blkno, + bh = __find_get_block_nonatomic(osb->sb->s_bdev, p_blkno, osb->sb->s_blocksize); /* block not cached. */ if (!bh)