From nobody Fri Dec 19 22:02:08 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93603C4167B for ; Mon, 27 Nov 2023 14:32:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233903AbjK0OcB (ORCPT ); Mon, 27 Nov 2023 09:32:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233780AbjK0ObU (ORCPT ); Mon, 27 Nov 2023 09:31:20 -0500 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B71D19AB; Mon, 27 Nov 2023 06:31:00 -0800 (PST) Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1cfa5840db3so23163715ad.2; Mon, 27 Nov 2023 06:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701095460; x=1701700260; 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=LSD6FwTVggzrZpf2kEN+3oSDCrGK42JmxcGcmXQsxww=; b=KLJx8QvmCPcubfTBNhQxVX0gSf3HddAJQa6MM86PMg781f5bWHIEXWR9ya2pRWqB7+ 9oWo4d/dsLZsiM/Y3iOVhi43VNcRtpVLG+sd7jMLWj/sKiLoNF8S63NLf3KkLcXVgfMJ TnZJIiD9tSNMk8kYQ0l02SxGOnIY6PZR/IOV6ByHcz7xCOt5RetIzXkdG1WgoSEZq/FS o0EZjK2snzpAtyfxfaFEcSkUxr3ZcVhMsoZFuNtOpEmB/T8d2f1w8cg8hzgViAiA3osE RjYG6uuduTC0xu65OzT1gO8gIKaJDI7R31AAOb1RLyguuSi6b+zAX4kfgoDhXrV2Adbk jINw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701095460; x=1701700260; 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=LSD6FwTVggzrZpf2kEN+3oSDCrGK42JmxcGcmXQsxww=; b=u80Z09Kv5SmFAuw7ITVf8WkbfcwLJOzZLudXU7t3m3dmLljAKD3OKC4zqMzRVkfwvs CQfmSz7ggwU+5nO/qrW76XY9Ay1l+eKyIWQH1dFUXFMttSYS6Q9Htdcv0QB9miCFGcwf DBT7eoV8JzFwo2dk1mIyz3l8SVH0hqLQLrQ6iklE1AsACEns0aLk+Hs1QbgKikR4k3g5 CoUNn9Yitkz7OfkZ/yT9kCWz9d394NScTXtD/8ysR+e3N1Bm75Vq/q+8CTT1ydb9PT74 HSDTYsiOtFl8hOV0AXG5yicbFnGn9fW6+IM0ZCo96Na8Sz1Ap/4/ORpgrjgHpvAMFoQK kPgQ== X-Gm-Message-State: AOJu0YwvnsaYzaTZO2tfk9QFuzKTW9YlHQh3B6G9QKofskHry9cTpaV8 P6DxrQ0N+DTwwTSZNO3rLac= X-Google-Smtp-Source: AGHT+IEF1Kj/8FJ+iVLoJfprjT4ji3uBhZlsosiVNxX3G5wSdQYnZ7HKAlwVCQ4nJEIhRGgGIPeS3A== X-Received: by 2002:a17:903:41ce:b0:1cf:c3fb:a982 with SMTP id u14-20020a17090341ce00b001cfc3fba982mr5966951ple.63.1701095459732; Mon, 27 Nov 2023 06:30:59 -0800 (PST) Received: from carrot.. (i60-34-119-11.s42.a014.ap.plala.or.jp. [60.34.119.11]) by smtp.gmail.com with ESMTPSA id a5-20020a170902ee8500b001cf51972586sm8302784pld.292.2023.11.27.06.30.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 06:30:59 -0800 (PST) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-kernel@vger.kernel.org Subject: [PATCH 06/17] nilfs2: Return the mapped address from nilfs_get_page() Date: Mon, 27 Nov 2023 23:30:25 +0900 Message-Id: <20231127143036.2425-7-konishi.ryusuke@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231127143036.2425-1-konishi.ryusuke@gmail.com> References: <20231127143036.2425-1-konishi.ryusuke@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: "Matthew Wilcox (Oracle)" In prepartion for switching from kmap() to kmap_local(), return the kmap address from nilfs_get_page() instead of having the caller look up page_address(). [ konishi.ryusuke: fixed a missing blank line after declaration ] Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi --- fs/nilfs2/dir.c | 57 +++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c index 385e47eda99f..45f75d4c4522 100644 --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c @@ -180,19 +180,24 @@ static bool nilfs_check_page(struct page *page) return false; } =20 -static struct page *nilfs_get_page(struct inode *dir, unsigned long n) +static void *nilfs_get_page(struct inode *dir, unsigned long n, + struct page **pagep) { struct address_space *mapping =3D dir->i_mapping; struct page *page =3D read_mapping_page(mapping, n, NULL); + void *kaddr; =20 - if (!IS_ERR(page)) { - kmap(page); - if (unlikely(!PageChecked(page))) { - if (!nilfs_check_page(page)) - goto fail; - } + if (IS_ERR(page)) + return page; + + kaddr =3D kmap(page); + if (unlikely(!PageChecked(page))) { + if (!nilfs_check_page(page)) + goto fail; } - return page; + + *pagep =3D page; + return kaddr; =20 fail: nilfs_put_page(page); @@ -269,14 +274,14 @@ static int nilfs_readdir(struct file *file, struct di= r_context *ctx) for ( ; n < npages; n++, offset =3D 0) { char *kaddr, *limit; struct nilfs_dir_entry *de; - struct page *page =3D nilfs_get_page(inode, n); + struct page *page; =20 - if (IS_ERR(page)) { + kaddr =3D nilfs_get_page(inode, n, &page); + if (IS_ERR(kaddr)) { nilfs_error(sb, "bad page in #%lu", inode->i_ino); ctx->pos +=3D PAGE_SIZE - offset; return -EIO; } - kaddr =3D page_address(page); de =3D (struct nilfs_dir_entry *)(kaddr + offset); limit =3D kaddr + nilfs_last_byte(inode, n) - NILFS_DIR_REC_LEN(1); @@ -339,11 +344,9 @@ nilfs_find_entry(struct inode *dir, const struct qstr = *qstr, start =3D 0; n =3D start; do { - char *kaddr; + char *kaddr =3D nilfs_get_page(dir, n, &page); =20 - page =3D nilfs_get_page(dir, n); - if (!IS_ERR(page)) { - kaddr =3D page_address(page); + if (!IS_ERR(kaddr)) { de =3D (struct nilfs_dir_entry *)kaddr; kaddr +=3D nilfs_last_byte(dir, n) - reclen; while ((char *) de <=3D kaddr) { @@ -381,15 +384,11 @@ nilfs_find_entry(struct inode *dir, const struct qstr= *qstr, =20 struct nilfs_dir_entry *nilfs_dotdot(struct inode *dir, struct page **p) { - struct page *page =3D nilfs_get_page(dir, 0); - struct nilfs_dir_entry *de =3D NULL; + struct nilfs_dir_entry *de =3D nilfs_get_page(dir, 0, p); =20 - if (!IS_ERR(page)) { - de =3D nilfs_next_entry( - (struct nilfs_dir_entry *)page_address(page)); - *p =3D page; - } - return de; + if (IS_ERR(de)) + return NULL; + return nilfs_next_entry(de); } =20 ino_t nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr) @@ -451,12 +450,11 @@ int nilfs_add_link(struct dentry *dentry, struct inod= e *inode) for (n =3D 0; n <=3D npages; n++) { char *dir_end; =20 - page =3D nilfs_get_page(dir, n); - err =3D PTR_ERR(page); - if (IS_ERR(page)) + kaddr =3D nilfs_get_page(dir, n, &page); + err =3D PTR_ERR(kaddr); + if (IS_ERR(kaddr)) goto out; lock_page(page); - kaddr =3D page_address(page); dir_end =3D kaddr + nilfs_last_byte(dir, n); de =3D (struct nilfs_dir_entry *)kaddr; kaddr +=3D PAGE_SIZE - reclen; @@ -618,11 +616,10 @@ int nilfs_empty_dir(struct inode *inode) char *kaddr; struct nilfs_dir_entry *de; =20 - page =3D nilfs_get_page(inode, i); - if (IS_ERR(page)) + kaddr =3D nilfs_get_page(inode, i, &page); + if (IS_ERR(kaddr)) continue; =20 - kaddr =3D page_address(page); de =3D (struct nilfs_dir_entry *)kaddr; kaddr +=3D nilfs_last_byte(inode, i) - NILFS_DIR_REC_LEN(1); =20 --=20 2.34.1