Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp1196767rwb; Thu, 19 Jan 2023 07:44:12 -0800 (PST) X-Google-Smtp-Source: AMrXdXvWjMJJKE0vasxskCTidb8u5ougymprWxIECBozXNeK4QpW9ApmGWycf/UYVVP5SbjqyNOV X-Received: by 2002:a17:90b:3d0c:b0:219:5fc5:7790 with SMTP id pt12-20020a17090b3d0c00b002195fc57790mr11688226pjb.16.1674143052651; Thu, 19 Jan 2023 07:44:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674143052; cv=none; d=google.com; s=arc-20160816; b=jSzt1uhJDYEd56rZau+RiRsbbj6VPm4r9ehrt/uVoIUDnug/enpDJAuQh0ydOjm4xn 9iRyIF8MpHUcVhb7TD01Me0VDHa9A8S/6cOG1vtV/wM+2BI4RiLkQhjuAZrDPZevFu23 MgPfPPln1HMhcyEKftgpTngnPHvgf28FHKhMCWlcLve19epOsdnvgfjB7NrYFS2KY3kM v5D7YMBFgfLidBwd8tk01/dpNlntFZKyPE25Use6T9M6VcIanS6P29zUZFIbw3p30Owh iX4l/jtK8o0VkfhQ17ic93hngg/xoNaZsD5uGJMa+fFJEepFt4Ynn27m0xJLXonAbC7U uNAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=t4IpF0CMnhbBf7H7iLN0nfh/18GS/Ps3ATwtaps4Vp8=; b=ckmm7+PkR8ZSEHsaA4jZOUDzpwAgPbHq4JF+ExItFFUdX/GT3lHFV4KZfAKdPvugyw YRCvjlDszj+5yhbTbiVbVhZ6hsBgxTeOOXNbTyMrNmHPovzfW2MQzOcHG7Fw/D0Yr7Vj gVNkPSomo6Eyay/MGxdULm0zWggBpUahgf7FzmQXc9fbEJjTdvMc4CB8+6vC5S9oEPBt woVPabAq4u0MEy2y8Skt9+8p6RTMoF2ng0pqKNzBQSWlPWC1pBrJFQ+FwjPErNWIpxI6 dYycgdJxwJ5S9Eg9v1B1i41w3UCjBrF4mkyCnw/yZ3pXw8Q3/lJK0Us0q1CTJRF5rg7i +0xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Z3RzMKM2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h3-20020a17090ac38300b0022939a02263si5153881pjt.45.2023.01.19.07.44.06; Thu, 19 Jan 2023 07:44:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Z3RzMKM2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230306AbjASPcs (ORCPT + 45 others); Thu, 19 Jan 2023 10:32:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231130AbjASPcm (ORCPT ); Thu, 19 Jan 2023 10:32:42 -0500 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3ADD40BE4; Thu, 19 Jan 2023 07:32:39 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id d4-20020a05600c3ac400b003db1de2aef0so1540644wms.2; Thu, 19 Jan 2023 07:32:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=t4IpF0CMnhbBf7H7iLN0nfh/18GS/Ps3ATwtaps4Vp8=; b=Z3RzMKM2PeGPS/g6yCgIuivIMD1cD+w6CLOObE5w4jVExMsj5qYi5WIfgNlz+SjDCO LTW2cnLatJ5ybfa3z6GSBsbbFSgzlcTReqJlOmGJnVrPfZSUm5kWxMxZM6l+d+mZTnhr mgBX7ABHfnQ0H7GhOvyIQyw5yFHnYIbg5Db5XFgOL+DHv+bmZGNRNPpexIn/51GN7P9Z JjqLCVHFyfKLt3Y+WB1E6wV/Sh8+kgzVV/NOrVpgPFMeN9tJXKppYR+Ww4LGjs+rKTIZ qwcJ9ZeCaQ8UHpBeT4THst9TSlHUh3bP1BKfSy+tSRDQWnTSYZW4Ki8TuMVGc2+4qRnH Lj2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=t4IpF0CMnhbBf7H7iLN0nfh/18GS/Ps3ATwtaps4Vp8=; b=eQsn3prTZmhxGmIm9/s4w5MrgXOfbT/MsSRic1no/fYn2IMt41DIiTGrOcaAYlPOBF 5gNJ1x+t760yCvBSGi7UFX3+ACfHKbyk4a3xpOYrb/Ds7zTaScUbv4uZaXSESe+2vMV1 X1fSTXF6Fpht7pQ4MqN4er5q0U6lKq8RKXQ5ou/OqmTb+haAq4qzRWqwkxPlh728XQX2 KnoWa8OcrmQ1UZLrZLrWFDFu/Bvjgoiz/pe57gH/aywLHmAaxsyFb1CI1Eubk48WeeNq jeqKsHrd2VaAsfvGBsaHukMG2QQaQ32WE+EQrlK2JGTAaozW2iiftrnrQZnxoNWUVZOi V5eQ== X-Gm-Message-State: AFqh2koylKZu85SCXq/1lphTAdfLjy5ZS50rN4iHZNLDR+WuxF7eFmrS DqHyFlB4W7JukZy5WHfjIyQC9m+f5YM= X-Received: by 2002:a05:600c:4928:b0:3da:909f:1f6b with SMTP id f40-20020a05600c492800b003da909f1f6bmr11044750wmp.1.1674142358283; Thu, 19 Jan 2023 07:32:38 -0800 (PST) Received: from localhost.localdomain (host-82-55-106-56.retail.telecomitalia.it. [82.55.106.56]) by smtp.gmail.com with ESMTPSA id k34-20020a05600c1ca200b003cfd4e6400csm5827815wms.19.2023.01.19.07.32.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 07:32:37 -0800 (PST) From: "Fabio M. De Francesco" To: Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Al Viro , Ira Weiny Cc: "Fabio M. De Francesco" Subject: [PATCH v3 1/4] fs/sysv: Use the offset_in_page() helper Date: Thu, 19 Jan 2023 16:32:29 +0100 Message-Id: <20230119153232.29750-2-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230119153232.29750-1-fmdefrancesco@gmail.com> References: <20230119153232.29750-1-fmdefrancesco@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the offset_in_page() helper because it is more suitable than doing explicit subtractions between pointers to directory entries and kernel virtual addresses of mapped pages. Cc: Ira Weiny Suggested-by: Al Viro Signed-off-by: Fabio M. De Francesco --- fs/sysv/dir.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c index 88e38cd8f5c9..685379bc9d64 100644 --- a/fs/sysv/dir.c +++ b/fs/sysv/dir.c @@ -206,8 +206,7 @@ int sysv_add_link(struct dentry *dentry, struct inode *inode) return -EINVAL; got_it: - pos = page_offset(page) + - (char*)de - (char*)page_address(page); + pos = page_offset(page) + offset_in_page(de); lock_page(page); err = sysv_prepare_chunk(page, pos, SYSV_DIRSIZE); if (err) @@ -230,8 +229,7 @@ int sysv_add_link(struct dentry *dentry, struct inode *inode) int sysv_delete_entry(struct sysv_dir_entry *de, struct page *page) { struct inode *inode = page->mapping->host; - char *kaddr = (char*)page_address(page); - loff_t pos = page_offset(page) + (char *)de - kaddr; + loff_t pos = page_offset(page) + offset_in_page(de); int err; lock_page(page); @@ -328,8 +326,7 @@ void sysv_set_link(struct sysv_dir_entry *de, struct page *page, struct inode *inode) { struct inode *dir = page->mapping->host; - loff_t pos = page_offset(page) + - (char *)de-(char*)page_address(page); + loff_t pos = page_offset(page) + offset_in_page(de); int err; lock_page(page); -- 2.39.0