From patchwork Thu May 2 08:46:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kairui Song X-Patchwork-Id: 13651433 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 6C4D9C4345F for ; Thu, 2 May 2024 08:47:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E97976B0098; Thu, 2 May 2024 04:47:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E48686B0099; Thu, 2 May 2024 04:47:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CE9456B009A; Thu, 2 May 2024 04:47:44 -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 AE2C96B0098 for ; Thu, 2 May 2024 04:47:44 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 2DD5440C69 for ; Thu, 2 May 2024 08:47:44 +0000 (UTC) X-FDA: 82072827648.25.9672922 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by imf25.hostedemail.com (Postfix) with ESMTP id 57ECFA0013 for ; Thu, 2 May 2024 08:47:41 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="aDn+/5/m"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.216.41 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714639661; h=from:from:sender:reply-to: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=o1JDj7M+VHieQbjCEGNpRgkTBIVb3xdVSM/lbKWffPE=; b=znlv2DZkE1ov6u3LfimVuNJSp2SpJ2otuwDkG7uTyFuREbrvIpQGMnTiOWjV6zqdgxrjWX wTjLQjdt0diB+9se9sJLEk0L22bRV+pQYIwSz7HgQWrcYUQb2L/2WoHfeINpkx55vvpH4G vzO2hKqKKVcTdr8NhylyGYqkogl/FUo= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="aDn+/5/m"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.216.41 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714639661; a=rsa-sha256; cv=none; b=kCv8Bwx3WIRgLFJ/LJM+3DPYBLvQU/OpgrUANDHJrlc0Vz9AxQZwuxMYAWdbEIfrGI3THG gHn8tcjkz4GXW9vRi25uDlmS7i/lL4B/94Ffgq1x1cqN9HcFucwShaLXmuVhm8XJeu35LA HfCkqFcgL/tmTKlEuDa5ZkOtEgGLJaQ= Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2ad8fb779d2so6190723a91.0 for ; Thu, 02 May 2024 01:47:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714639660; x=1715244460; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=o1JDj7M+VHieQbjCEGNpRgkTBIVb3xdVSM/lbKWffPE=; b=aDn+/5/mqxzNKONIpas2hCudVUbLfh+vYnT5EbOU7uh1ZHIb8eT9BRWInMI1hyUJ7b RBz7gg5qVnoLUGamVZk2uSdUJNDy4a8bhC8XHWGyUxk6X8aAUO2ck68Cy2sVWrwDzKgf Yv6jXJlZYhQNQ4TTMuQ5HD6lat64KfZ9aJZQH6+pr/T5tuO5mzhEmuIuMlbajDO5u054 t2l0Njts6HRDNApnQvz5NMrJDGBJsnajrrRR/890gEf9ti5qgSu/z1D5uG3bHNY99Fm4 x/nO0cj/iqr9oNsMy2/PI9tiRwRduG9KE9LpUpvI5Ei5YY1cAQlN1NxtNkLRhE1HA8Tp fJ/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714639660; x=1715244460; h=content-transfer-encoding:mime-version:reply-to: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=o1JDj7M+VHieQbjCEGNpRgkTBIVb3xdVSM/lbKWffPE=; b=PZ5uCLHEWcSVBiJf1IsAiqwAEReTNdOHZCttUTsuCY7rma7fwv9lcWa/OFRn/b5BDz MjkM83GBiLoLKxFPcdAc37+1PyCAAn2+J38xdhJtYsQcZS3N2NhVLaULQNDMiSM1NG4Q NKkT4AKX+VEklOgwn6CLpGa/UDw3dQtSWaX3KM5A1aPrJndg+0J+5FjBKIDm36nXMwwx HpSMdjzRbMKYwVFamT9sSp5OrHJRulekBlFsNqgITae+Wjoysz/EPD3jCmZ6i+5p81ro r5S3ZjiE7WTeN34lFSDSkJ8mYc+zEygL/Prx08szo4ny7aE9ORTBhTMfG85GU1KXlAa1 6WNw== X-Gm-Message-State: AOJu0Yyr/MsMOI7R+1d6UIGnHpoSxLDkGh6+O4aIKrZQgeQOJY4SVW3m hLQW4Mf+fKaQ0TkRUon6VFCd6LZ4Vtrbp4Sl+hm3YEHhhjUR4NRY/0/pRSlivhs= X-Google-Smtp-Source: AGHT+IFBu+Fs+rmoaivL9bptW5t+ch5V+p6LPKN15/2dRUJC/IPaj96UkzDDRSMAnS5vPG9aDDkxww== X-Received: by 2002:a17:90a:550e:b0:2b2:9d08:82d2 with SMTP id b14-20020a17090a550e00b002b29d0882d2mr4896166pji.42.1714639659690; Thu, 02 May 2024 01:47:39 -0700 (PDT) Received: from KASONG-MB2.tencent.com ([1.203.116.31]) by smtp.gmail.com with ESMTPSA id q6-20020a17090a938600b002b273cbbdf1sm686805pjo.49.2024.05.02.01.47.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 May 2024 01:47:39 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , "Huang, Ying" , Matthew Wilcox , Chris Li , Barry Song , Ryan Roberts , Neil Brown , Minchan Kim , Hugh Dickins , David Hildenbrand , Yosry Ahmed , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Kairui Song , David Howells , Marc Dionne , linux-afs@lists.infradead.org Subject: [PATCH v4 06/12] afs: drop usage of folio_file_pos Date: Thu, 2 May 2024 16:46:03 +0800 Message-ID: <20240502084609.28376-7-ryncsn@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240502084609.28376-1-ryncsn@gmail.com> References: <20240502084609.28376-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 X-Rspamd-Server: rspam01 X-Stat-Signature: ruq6ecfbthmar73f5mb6ocru5xyz9odh X-Rspam-User: X-Rspamd-Queue-Id: 57ECFA0013 X-HE-Tag: 1714639661-376712 X-HE-Meta: U2FsdGVkX18NsHIrl7UoMNM6oON+jz2TIIt0Y8HRpqKTOMfyYKFfMwk9zjt7tYUw1yfvdzlYLocxiFAKxU+QpQr4UQ78ykDnPwy3GzJfphuBZWmyDjORzKzbyG+T06U50DoTf529H6gqgywQPjLJX/S63p3xKT6IcdquCwHSp/DYvwWB75XM7qlTaSHlVgDHCORR+dVT5yefw7IXN1cr1c3+nFF7LIHJJhopiSsPt0yPweQYRR3dZ+aihlOqA5SMvv1nyPr4lgpnnfsSLJ9sQsBXCxdiIpJZoNeultiuTYkZO7zbCJgCToCBsLhFrBbtXBB1RTorBdVvciUto83ZjTthER/MMNjioLh64ZlFlhQ4aNkocbOOaz5/qUhCixgOGGddSRgYcC9jw30hmV92d4U8nFdfAwcYIpNjfXW2OdqOME/zmkPImPs1LrMsGhug29PrWcd/HNznR5TNb2EYK71oNo22pHAuy31mHF7ErxsiE1YSGf6lUfz0nqCuRK0hjwHYaBCSYxQUAlCq7t4iLAgcLypu/nKupH5ljWV7V1AAdCXws8hn5HXBoJqbcVPKOicNsnU7U2gEhN8c551weq8ZDaCfxkGfZ3yzQsTeOc1QQeC7oQil6/k5xi1eG65fiGr9U4pNC/HCai90zDtF6cMyr1pQTPBLvXoNLHr3c81Egu7wQyQNYXYp+QZLSQMJv7vSFAM8dX07shuzadgRMr0pvYXKnbkrDFgP8X45H/NBBpT1xu3RyUO8CKMxj7WmETxh0S+BZf6tC4spxO38mt/4obl/bANnVJo0dV8vIJJ08O5Dp6SqqsugVktVLEqbmwConyYQTvV9nR710LkyvOovI7WW3o/PPw3BjQalGzkB5KXb7tPYzkl+yLyPIJelZMp6rLubr1gwoe5jqVNq7o81TaUZjLK99S4ldwPO8W1cG8ECm6SAGxkDeqsLhZjc0pOTvGpthwkHFeMEQtq Ieuv7Cma cZA52MOjBwKIxWelOXaAIcYajCggBe+42KmGUl0AKG+XNpaAwGh8NEBw2imeyvkD9tl3gTBAD+BNev/egmb/DALIG0ryT5ILuFO2YxkxfyGl1C9DWe/oUglKGllaUs9GfmMNArt4M/sr27qs24gkjfaHGA+uv2w1LGkBAJT3xTB5JWOitzOvy9UHxA75ABHJON+QjOzocBC1+VtH2oPGlIq7bWcmthbA8gauIU0MEzlWZjHKelt81BHa2nshAUHzwbQRNY21yhjuG4g1eU0Y0vPzJ5pu1jVlHNb896EEdGtSU5Woxl0yA7YW2eFccETmBJhjTi+Lfa3/zYtWA7lOmrogTvvLSyGG3Ll/xLs3jEqrBWwJJ4rBC06VrVSk3RJB9RV0mKLWL26eJphPwkgqVtNe0poqNPyw9t5F4O+gknxSIzth3Yg7t+eRNT5Dv9rtqS078KUbDPIPsCteQ8oudsunTWk7j8nAijWru4R+FGGdBMCfxk00ICsePvsXpApNh4NYTh/dg+p33M6NyTPcPrAyJL4XTaCTpp+INaUi5eZ/40VcEvKrAIletjWJ6uO2U6Slu0HQORikmlA++AG6kOzKSwoJ+y1OPVSIlrcdwXWA1SGuswBifSXeo1Y0hjnqlwZZtVrq4f7e7EN0p37lZL6W6UzKvbHP4m/pj1E53tVjsAdMXcxIuL2R2VNv6tNoQFtd3WGNoziDQvGvF/tTznlBUNZGeKw/fBxB0BdtviwUCNnfrFE1i7/Xgpnx4QFUbG+aoWp3Z+FP93r8N1aYxFuXWShzkJv64AM9zWME6XCsLjgPJznTAU3DgbQ== 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: Kairui Song folio_file_pos is only needed for mixed usage of page cache and swap cache, for pure page cache usage, the caller can just use folio_pos instead. It can't be a swap cache page here. Swap mapping may only call into fs through swap_rw and that is not supported for afs. So just drop it and use folio_pos instead. Signed-off-by: Kairui Song Cc: David Howells Cc: Marc Dionne Cc: linux-afs@lists.infradead.org --- fs/afs/dir.c | 6 +++--- fs/afs/dir_edit.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/afs/dir.c b/fs/afs/dir.c index 67afe68972d5..f8622ed72e08 100644 --- a/fs/afs/dir.c +++ b/fs/afs/dir.c @@ -533,14 +533,14 @@ static int afs_dir_iterate(struct inode *dir, struct dir_context *ctx, break; } - offset = round_down(ctx->pos, sizeof(*dblock)) - folio_file_pos(folio); + offset = round_down(ctx->pos, sizeof(*dblock)) - folio_pos(folio); size = min_t(loff_t, folio_size(folio), - req->actual_len - folio_file_pos(folio)); + req->actual_len - folio_pos(folio)); do { dblock = kmap_local_folio(folio, offset); ret = afs_dir_iterate_block(dvnode, ctx, dblock, - folio_file_pos(folio) + offset); + folio_pos(folio) + offset); kunmap_local(dblock); if (ret != 1) goto out; diff --git a/fs/afs/dir_edit.c b/fs/afs/dir_edit.c index e2fa577b66fe..a71bff10496b 100644 --- a/fs/afs/dir_edit.c +++ b/fs/afs/dir_edit.c @@ -256,7 +256,7 @@ void afs_edit_dir_add(struct afs_vnode *vnode, folio = folio0; } - block = kmap_local_folio(folio, b * AFS_DIR_BLOCK_SIZE - folio_file_pos(folio)); + block = kmap_local_folio(folio, b * AFS_DIR_BLOCK_SIZE - folio_pos(folio)); /* Abandon the edit if we got a callback break. */ if (!test_bit(AFS_VNODE_DIR_VALID, &vnode->flags)) @@ -417,7 +417,7 @@ void afs_edit_dir_remove(struct afs_vnode *vnode, folio = folio0; } - block = kmap_local_folio(folio, b * AFS_DIR_BLOCK_SIZE - folio_file_pos(folio)); + block = kmap_local_folio(folio, b * AFS_DIR_BLOCK_SIZE - folio_pos(folio)); /* Abandon the edit if we got a callback break. */ if (!test_bit(AFS_VNODE_DIR_VALID, &vnode->flags))