From patchwork Wed Oct 4 16:53:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13409071 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 561D4E7C4F4 for ; Wed, 4 Oct 2023 16:53:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7665E6B0272; Wed, 4 Oct 2023 12:53:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 717A06B0273; Wed, 4 Oct 2023 12:53:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 62D826B0274; Wed, 4 Oct 2023 12:53:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 508AE6B0272 for ; Wed, 4 Oct 2023 12:53:26 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 15735160242 for ; Wed, 4 Oct 2023 16:53:26 +0000 (UTC) X-FDA: 81308374812.09.417F99B Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id 5CC1B4001E for ; Wed, 4 Oct 2023 16:53:24 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hqTAtSri; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1696438404; 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=U/Vyp0aKIbZ3gNGHQHjQi68gNh+m4QRK2qf3WFlHu+A=; b=ex34bWmnPwqrqPEUrdtY3oSIC12z3y0E1nI5/bTfsPUoDd6CBZPB8AoJ5rz5A8iqKu9KJ0 IyISq2zptiNRINJdJRkfdlWSxspRktLfvq+LDffMbRQv14fceRFfMWiWhvp/j/epvvQX86 CaaZToWuSMJA7QDh8xnphELWH1MOsu0= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hqTAtSri; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696438404; a=rsa-sha256; cv=none; b=3LEjdyIQWynjjqo8TNDeItpGxkfA0ZHJi9iYezi2Wy5ArjB/6yeGfadxJR+ZT/T9odmQnd zTl9hFz/+tWEMMzb0lKqvkdvZrHhjG+jorDRkHuCqOSAJ7xNIlZS2ZD2/5OLO9LcR2uP8L jJKWgceBoFPceGZ3w1cQdvynrCPlEcM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=U/Vyp0aKIbZ3gNGHQHjQi68gNh+m4QRK2qf3WFlHu+A=; b=hqTAtSridyfli6pM0HAtD5mGUD x3UeVRaQnugrAHI9tVmxaGGWCylda42PfRvDvDTCfZosLAJOrtxXWncHhy7ugK5RC+8zwpsSMQiHx zjILixsx8KeS/GggIiiCKJzhv2UGKpZCzBgV6BeAQu5ok/eK9hSUAyQrJ1O3ENZIUjeaQ7kp/7Nwe L0Ys+GJYDUnAgy3jIgg1/c1F8Haysgu81TvbZFxBtDXotFrU5uUqVVjYfr3jI4tBbrlSM/3o9pUXv 9MHl2Ue6kGqBxr1af3neVOGUntd1/rGg9l1B+TgD81IChLPjBy4PBM5P7HDY2256LbtVQFNhiR8m3 aDTshtSg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1qo57f-004SF5-Iy; Wed, 04 Oct 2023 16:53:19 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, torvalds@linux-foundation.org, npiggin@gmail.com Subject: [PATCH v2 06/17] iomap: Use folio_end_read() Date: Wed, 4 Oct 2023 17:53:06 +0100 Message-Id: <20231004165317.1061855-7-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20231004165317.1061855-1-willy@infradead.org> References: <20231004165317.1061855-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 5CC1B4001E X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: hs1k4sfidcm6iysxuwyud5uzmix411of X-HE-Tag: 1696438404-584975 X-HE-Meta: U2FsdGVkX18zwsbD3fxs3sV9Xb21Ej+yaEP2NE4xBtar6x5VpJAPNil7Ksy1v3sCYY5545YU/Q+Xks+hRCBDlWYsejPxZZUbLuHQRvSBXLOVZz+AZCMDcfTEVnpntsSYkNCrMCWQZ4j4xVW4YL1nmjzasex/IVfJheFwdJobFl3ytQ4hf8tKYwMxl77jZueR84Gfm+rrKmf2UK9uSjWAQEWePeIAFR/JCEDtX7PUjiksaVP48ZatLi+tLvLg9b8lYJWJBBb42syYugDPaWv8bHSWpQpv0knPsbOluHYBaeQLYR9fMnVdTUnkQcugnDUxq+KY1Iky/lVBcMfFkZRRh/wRJShs+Kopor7KN7006XX8/eMB2t/WdlBheFTIJpceVJSlo0j+uk2p3DU+K+uqrREeNrE5ULs4cvSaEw0ODm8vgyzJHymtumyjSURSsXX8rWZL2qcw0mPsSXdMaPy9BSy91pvTUof2uYLP2669/m1DveI4UM719v3IM2wfcdIv0lwpbOP/mU/mBemzQt0zBbz+0ItqeD/kgRM0pGN0wKIArQGoWxaEjvMdwDSPkmmRZLP5VY7wkjCniIzwbhE9DpRqTed0i5U53c+FL/Aof8Teqy+iZMIDv8IxIG40lwfcGZ7GKjErGmN9JdiPdBOB+q9CzM65FxmQdQ8TgDnJ+TgUyGQZ1MZRGoXZZyg6ivtgVxITQDNunWKTyPHhIwKr0mtXp77sQykJb+PtFjnBtpWwO0N+Ohlmza3JVKzxxvYIBSQg3YnQrWbaoq9Mnc5ORLg3rr4f5EzncUmbiuneowdYn+cauBfJ+1if8RKf0hfrTYfmplkySPhIxJ7f+vCTPcmBwBJkQ17eZa11LVSfIwlO6+e52H4tp2wFdUGe122Nz1RcNRN/Apt77wWJEiFLL0KC8ngJ7DM+Wirb90AhEBn9F7lNdcuNVkppi72MlBTtKi97GN9X9lM0V1SLjh6 RbJLeDDK IH2Mu6NxMatLLPFhg52sLvxQ7tTAlfj3zBJxe6GcGXwvoFPCyIMl+Z7a/ePOkoGaLRhc+I9Ch/o+IhO37loYMsf+Kiit76UeS8bBCyybSNir0hxEoNC5w78ZQaQ3rb1zuYZVbeP3G+GQa9ofDkT/Bw0Crnx6knrh/II4AKqlZKFludgwnAXA0siadikeKua3S9sqlhsJmQGV51uUJGmBaS1fZMPQlx0Vdi1CZ8hqs3zwADrUsHDREO7pnWdEJ1kiIvuO1 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: Combine the setting of the uptodate flag with the clearing of the locked flag. Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 4a996c5327ef..5d19a2b47b6a 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -270,10 +270,8 @@ static void iomap_finish_folio_read(struct folio *folio, size_t off, if (error) folio_set_error(folio); - if (uptodate) - folio_mark_uptodate(folio); if (finished) - folio_unlock(folio); + folio_end_read(folio, uptodate); } static void iomap_read_end_io(struct bio *bio)