From patchwork Fri Apr 18 01:59:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davidlohr Bueso X-Patchwork-Id: 14056542 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 DB855C369CB for ; Fri, 18 Apr 2025 01:59:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 514546B02A3; Thu, 17 Apr 2025 21:59:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4519D6B02A4; Thu, 17 Apr 2025 21:59:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2A6946B02A5; Thu, 17 Apr 2025 21:59:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id EC8EC6B02A3 for ; Thu, 17 Apr 2025 21:59:39 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BC9A11A0C0E for ; Fri, 18 Apr 2025 01:59:40 +0000 (UTC) X-FDA: 83345508120.29.7E86F90 Received: from rusty.tulip.relay.mailchannels.net (rusty.tulip.relay.mailchannels.net [23.83.218.252]) by imf01.hostedemail.com (Postfix) with ESMTP id 9013A40003 for ; Fri, 18 Apr 2025 01:59:38 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=stgolabs.net header.s=dreamhost header.b=kpdvvT0I; dmarc=none; spf=pass (imf01.hostedemail.com: domain of dave@stgolabs.net designates 23.83.218.252 as permitted sender) smtp.mailfrom=dave@stgolabs.net; arc=pass ("mailchannels.net:s=arc-2022:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1744941578; a=rsa-sha256; cv=pass; b=x+EmrxZX2Q0WJ9bWmF21bnSYaPM3Yb/LF4kfb6/uAuxLVPqHvQJNd87Qj7S+bxZl3QNnRJ WrPfemK5Z96peGmQUPEDW/87wEoueTyAaalMV/5zIsBcu0sh+bv84xGPkhbOpHawLEftT/ asmVjV3UQw81BauykH9rNeExYw9jfIQ= ARC-Authentication-Results: i=2; imf01.hostedemail.com; dkim=pass header.d=stgolabs.net header.s=dreamhost header.b=kpdvvT0I; dmarc=none; spf=pass (imf01.hostedemail.com: domain of dave@stgolabs.net designates 23.83.218.252 as permitted sender) smtp.mailfrom=dave@stgolabs.net; arc=pass ("mailchannels.net:s=arc-2022:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744941578; h=from:from: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=MabBCGA0m9wa8fg8pahJUNB3mGjC5+Tn6ArLhv/vZP4=; b=VC7vtuowaiAnjPm/4ZDiGEuU2Oe2MVaImbCXHFeq0/L1iLWj+iRx3vuF50vtaPZbfq3qbV pd5S4iHvvS4mcWeonQZMuty4cHwQ9UTEOw0QCo0KDJTcj9mo2SUFteHFeXxwNAXnGSFgN2 OEu9liWre5xiSUIC7/HzbXTp+yEbCtc= X-Sender-Id: dreamhost|x-authsender|dave@stgolabs.net Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 6A4B14E3E63; Fri, 18 Apr 2025 01:59:37 +0000 (UTC) Received: from pdx1-sub0-mail-a285.dreamhost.com (trex-8.trex.outbound.svc.cluster.local [100.110.156.188]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 0ECC44E3DA7; Fri, 18 Apr 2025 01:59:37 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1744941577; a=rsa-sha256; cv=none; b=9z4NAulcqZEtIT3DSYAMJEEzyHl4OUVDXYUa/u5xxIbUVEx9loFzXyemUYJIxCWwdjYugU WVF1FilRhnoPGcGgKkwBwVfepuUU+AqqpF3wAA1KcaG8DZbz/nIgk9g1NTLrx3uW6NYbyn +b/V3NaPWumOJic84c6hJowbpt0eGJ+PO5jbunEdw72a2KmiKWXfJ2HOPUtHgjV9irGf6x ymgpFhEeG3oIadQhFKeXeJ5C/sirbDB3bfPjKFoV0v16fYNioIpl8r1LN0rvGYNtpr38zT P1FzH/j3/aENh8ndcvWFl3cunGnzuk0PdkKns6nGngAdcG9fM2inhua8M0UgjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1744941577; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=MabBCGA0m9wa8fg8pahJUNB3mGjC5+Tn6ArLhv/vZP4=; b=f90j+YzQ7hjLmbPv83G8gY9IV1ngRf+fEsgixVWiTHTW34CL04W5yZhP5quyBOfr1nG4sz WwuXcWe6OJOxnILNXMKEecU/l3HkvNTGImZohFuToUOLb+gLH6XUYJJzPWFgSARgULnusF ibDXExRqho6UW5OK1/337w/kviXgddoOO1mzTPCB/X51rWMKAVznGP7z4QcBTzp/GzuRIZ pxUH4WR014BcLc5wosFrmtvAbytHTS6lGt8Hh9xXJv8ExN1kCJXrNYSkjIBz1tVHA6fQp5 rBqYWsMYOWd0/2K9nKxhqyR+L+POmNVJ0fwLtJhTKHUF5MUGqCoeBTlJHtusuQ== ARC-Authentication-Results: i=1; rspamd-7bd9ff6c58-xxcc2; auth=pass smtp.auth=dreamhost smtp.mailfrom=dave@stgolabs.net X-Sender-Id: dreamhost|x-authsender|dave@stgolabs.net X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|dave@stgolabs.net X-MailChannels-Auth-Id: dreamhost X-Chief-Stop: 39defe2a79e53d38_1744941577351_2613637192 X-MC-Loop-Signature: 1744941577351:2941586493 X-MC-Ingress-Time: 1744941577351 Received: from pdx1-sub0-mail-a285.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.110.156.188 (trex/7.0.3); Fri, 18 Apr 2025 01:59:37 +0000 Received: from localhost.localdomain (ip72-199-50-187.sd.sd.cox.net [72.199.50.187]) (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) (Authenticated sender: dave@stgolabs.net) by pdx1-sub0-mail-a285.dreamhost.com (Postfix) with ESMTPSA id 4Zdycm1J43zC4; Thu, 17 Apr 2025 18:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=stgolabs.net; s=dreamhost; t=1744941576; bh=MabBCGA0m9wa8fg8pahJUNB3mGjC5+Tn6ArLhv/vZP4=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=kpdvvT0Ib2FwXMXNFIsJ1B3ejhEV1qHORy8ifsLmPDuDI2XKOMNKHFP5Rw0CyLl6w rR7V8hLj+GfhGeWq4jzNR3MQZ8cgo84qj8xXYxoeLMTWGMFoKm55+n8ZLsPgH8Aypr wErbSM37TrMzASGozlXONJ4ETYCh+H9xLho51IyRgg7sqopDUKLBRXEkzinUEH0/Eg fqka2BRDE/gaK4M5naK6mkgn/RN+5RRk7FawYGfUHZf1Gy5gbN9i7ubDYRxOs921G3 +trPpaHa7x8wUg9nakawBIH5pd3uABIt1rk3+wl80IGVPnZdyuX0hEpjlKqANg5W7O A5iiKcalfiCKw== From: Davidlohr Bueso To: jack@suse.cz, tytso@mit.edu, adilger.kernel@dilger.ca, brauner@kernel.org Cc: mcgrof@kernel.org, willy@infradead.org, hare@suse.de, djwong@kernel.org, linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Davidlohr Bueso Subject: [PATCH 4/7] fs/ocfs2: use sleeping version of __find_get_block() Date: Thu, 17 Apr 2025 18:59:18 -0700 Message-Id: <20250418015921.132400-5-dave@stgolabs.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250418015921.132400-1-dave@stgolabs.net> References: <20250418015921.132400-1-dave@stgolabs.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 9013A40003 X-Stat-Signature: ereojbwnjumyjnxyjkm9cposb9j5kmmx X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1744941578-950283 X-HE-Meta: U2FsdGVkX1+wnfkM04mBFX9uJMePdqE9SoTgEt0KKYFT0XTlVOE4CYsDoUV3BmSooqMASli9xDDBBmyjPob/b9HKlDM1t0RXCEatUQYqDCAnofLqXp4IfbUVzRkA3ymcIJw2H64RHoYaz7RX4gLr3o2dczA9zxjSBqYBCFLo89ERRh9ZkXkEQt6EMkN+7IX1nczbssF278IU0xFweGmbyvXfmz2t0dq4b4U94UmP26UxlR5YqRUNprOvKDmZOlfFIhjH+LCH3Hx0U+5icbAiqnUvA/4dngJsBwZljCjNvfLX70nHIdDuzGbnWYbupc+Bm5cZHnhfdI3Fioz/d/VLS7+lj5VIYFY/RoIji0E58wn5gx6uPkJeqzbKmycQi5zLG8DS7JWyz78tnHz2VC+MFh8VzStHAM+kXCayyGxLQLc8IA0NhOr7zpjhT4HklOpxRRUXnAc80txVrsfuXUIzYqLGQV0DzZm6kmmrs7MreYhHiVgWNs+1z1dNyE7gEmj5LyMOiuZc1bHY6zn9TdDnxdxfBFwsQeaFhwMh8yE6xrai38uCz7Iis04CwAN2yIUkyeqN+rEjKNuw7rYwNCFWy7LgWYOlHHcAl/LorEgZWyBrwkhyUZyrrG95lNfS0ZptG7fKISWXeR6Xk8e/qY8/7LoPKhGkYpMgzsSCBx1Q0HBALttsT7y/eot/pSkUueN5QU+VGXNabg3GGGejSwis8k9K/2cDBgWmFMybcMkWy9XAjEZaHme5sCQet1Ju2zKsiyaftCukKJ2iQLLMr2NasEMbUK7fLJO8asQk3DL7aah8HRBBLaMYrZJfGXJ+Wbt4odUJDEOUimxwzZpC+bm5SatHKAplJnUVUEuhn2AAuZJwonUoJ2k8+M0kwRF/fRDONt21lmPLnUD6rh8oCBmv94VVGJEsZUrPFdLxwzFFm2YvOWibT4nxsdbTIcbCgcUzGVkwLwotAcYB9sm0K+P UjWDrjEw GiTKTBjAcWiJzVy5Dg3pES7YQsXJW9KIjddit 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: 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 Reviewed-by: Jan Kara Signed-off-by: Davidlohr Bueso --- 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)