From patchwork Mon Jan 22 14:01:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 190192 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp2615732dyb; Mon, 22 Jan 2024 06:44:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IEf2hvje6pZ583g30WGGD7xvgasL/x5o0OT/CGAnhCve0uDm7abpHeWFv0EaWxmrXQ2VNDM X-Received: by 2002:a05:6a20:9384:b0:19c:4fc9:5432 with SMTP id x4-20020a056a20938400b0019c4fc95432mr789014pzh.18.1705934655457; Mon, 22 Jan 2024 06:44:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705934655; cv=pass; d=google.com; s=arc-20160816; b=Xj7VPpck7Gy3nGWK5vMSslvueem7MB9IVKsUc2/ImIFs0+z03D4av3neok1Qma2WSC EOT8LALAdkD1BJQD5X4aWyMspZpxawscFi2B6U/Kky+hze4Zj7kcZCagWyVLnyn2dNVJ 6DUYjNyiL51bsPrAtuRq2Aj7W2NuQFqtjGVmllhWnJ0e1Bu5N0O1mWuFPH9VMkqn99Nu j7TcsJuIcgmhxodSF7sKxbnh1hd4IY1oZ+UQ1kmkxHmUVaYLxZAaDM72bCUJbZCA6DZu W0Pwp/LHNMws1DDOHHPtPjqeNXJ4MZRt6sZJLWuxfVl9ZNZAV6n8gsCQSa1su2IKui+m 1Wig== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=la+vRQhSHTIGLMc3mcFeHM8AWwBAMUAN3NmM93QvSNo=; fh=M4BPaMQ5Q3X2+FKbhXoDpy+/1kcj8JGJnMEJ6o+yvT4=; b=0KjNlgfFVC5TSGUSjezz+mrkXgX4el/rDl5+mu9WnXYixQm7MxupfYnoRFBvxyHOOI TLW6PINDpMuRFCawq3uUlVybS8K2wS3OilJztmOF+UdaIDdFkY1BLkJZHdrhemryEPCo jonEQj+5BZ5IdyRo7HD2hB5xlj4RsDPeNidloEIKCmC6whrFSVxQA5AeUWwDcQ/ClamG eP/8D7FPQWKwkVUzDMisiDc/gpdFPT/OLRcPlXsw5ypEUx05XRICmAVAdzjvpOFGqjcD /xUBut/LndzFEtsF09lZsvgEe3lyGKn8X2GWj5hR7evsiRhxXBJwJTnJ65pnXdfyrD7d o8Wg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="HmTO/tUZ"; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-33122-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33122-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id q2-20020a634302000000b005ce26be61c1si8130282pga.346.2024.01.22.06.44.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 06:44:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-33122-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="HmTO/tUZ"; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-33122-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33122-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 90EC0B268DD for ; Mon, 22 Jan 2024 14:03:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7F1F93D57C; Mon, 22 Jan 2024 14:02:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HmTO/tUZ" Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B01333D3B7; Mon, 22 Jan 2024 14:02:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705932139; cv=none; b=tGjWibXLqWzXqn/o8GiUyC+pma/E8eGo8Q1hKNo0qZuj/On8acy9lYWP98Iqq2/Qm26uPN4lw+czr/RqRF08pMoaMq2wUt1DjsuYmwbwR7vEECu48fjRqjjVCFGMUO7CwMF1uSKBQwKB47pNBspvWR2klT4ef8Rs10LpbKCGZaw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705932139; c=relaxed/simple; bh=ERbftZ3Vd+XCk1UE8noci/tViuxyTk7z6UOt+ZHs2Xs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gLhxRKHs9BzvJxLHeZvLjgYTLovlbcm1edEGJGul/BlRooz47/OTDANA3wSYadBlzEUwetGEUVcYVH67BiABqUjFk1GHCteMnpYn0xLuV0LSzHgEi3GdpY/eEx3EYf/AXuzlzvL4izRaE/rMmpMAA0pD3TjAOhMhjeLjcdrWneY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HmTO/tUZ; arc=none smtp.client-ip=209.85.210.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6dbd7f1a300so1523259b3a.1; Mon, 22 Jan 2024 06:02:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705932138; x=1706536938; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=la+vRQhSHTIGLMc3mcFeHM8AWwBAMUAN3NmM93QvSNo=; b=HmTO/tUZfZnGamOKh+7vE8eZjCdP6/9GG8dCth0ufrmF81EQ43xXJXuyvE+4XPkUbf ADK0fcCISS69A/lFukyWolPBckDAj+Xj9L556QVZl/alk0r9Vg0k1ghsNPUshFLGBZ52 ohhehxfGVVbBReAvkXMUcTKVTsShfm1Vm43S2cHf0pPwe+CGQJzB+tcwhh1kjnGMJfC2 MNYP8fXnu4HdIQPbQCn7LgElVaT3dxmAE1fLJ8bgoLvEvLkUZCG79+3kFkybI+4S1XLm PzYbujbKzd4JCCdXcZbM8Aq1lzoBLsHErE/H3N/MIjLeuzal47Ya8UeQdetyMJHxW6KJ T4PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705932138; x=1706536938; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=la+vRQhSHTIGLMc3mcFeHM8AWwBAMUAN3NmM93QvSNo=; b=f9C8G4PgsYIzSkJ8COIdK7PKqAhBgFiyZTeMrmVMK6ahXWRekLXaQNT1GvL15ZDSLD hp8SvLbUUb72dSc1WnD1XnGn3WZ4CIqhlm+cwIHwATVvayxjabwPi8kVt41lyLbiGng2 MWdY6MoFtkeEnd+zGn1t2FJIFS0WZPke55QGayo1iX2PZxieS33lgnc4rX80pMGQUecq 4BgMm963wfKHP8nSuZBmKO8eY+jV+bXUyZPUYfvgh19uXB0+orRESAhamvZPgwSysbU5 dGFUrLAJqGSMEj3lbUaGTbLm2ptJt91J8+f2H9NYZ1usy5BnlS9QaH2nAVdIrKM6ULQl agWw== X-Gm-Message-State: AOJu0YzSBabZquII3/Wk+4aNWRuFWz4EynDMz/Lw1r7LGbv7eyDBy+2X dtVcQAK6AgVJweGRpZeIHqZ+/czeC0nl/wfEh+vusTxtq7cw1JIIH4xdtibx X-Received: by 2002:a62:d44b:0:b0:6db:3103:a1e3 with SMTP id u11-20020a62d44b000000b006db3103a1e3mr5131122pfl.27.1705932137894; Mon, 22 Jan 2024 06:02:17 -0800 (PST) Received: from carrot.. (i223-218-154-72.s42.a014.ap.plala.or.jp. [223.218.154.72]) by smtp.gmail.com with ESMTPSA id n14-20020a62e50e000000b006da2aad58adsm9901913pff.176.2024.01.22.06.02.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 06:02:16 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 03/15] nilfs2: convert nilfs_copy_buffer() to use kmap_local Date: Mon, 22 Jan 2024 23:01:50 +0900 Message-Id: <20240122140202.6950-4-konishi.ryusuke@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240122140202.6950-1-konishi.ryusuke@gmail.com> References: <20240122140202.6950-1-konishi.ryusuke@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788802137211716184 X-GMAIL-MSGID: 1788802137211716184 The routine nilfs_copy_buffer() that copies a block buffer still uses the deprecated kmap_atomic(), so convert it to use kmap_local. Signed-off-by: Ryusuke Konishi --- fs/nilfs2/page.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c index 5c2eba1987bd..14e470fb8870 100644 --- a/fs/nilfs2/page.c +++ b/fs/nilfs2/page.c @@ -103,11 +103,11 @@ void nilfs_copy_buffer(struct buffer_head *dbh, struct buffer_head *sbh) struct page *spage = sbh->b_page, *dpage = dbh->b_page; struct buffer_head *bh; - kaddr0 = kmap_atomic(spage); - kaddr1 = kmap_atomic(dpage); + kaddr0 = kmap_local_page(spage); + kaddr1 = kmap_local_page(dpage); memcpy(kaddr1 + bh_offset(dbh), kaddr0 + bh_offset(sbh), sbh->b_size); - kunmap_atomic(kaddr1); - kunmap_atomic(kaddr0); + kunmap_local(kaddr1); + kunmap_local(kaddr0); dbh->b_state = sbh->b_state & NILFS_BUFFER_INHERENT_BITS; dbh->b_blocknr = sbh->b_blocknr;