From nobody Thu Sep 18 02:40:03 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 386E8C4332F for ; Mon, 12 Dec 2022 23:19:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233816AbiLLXT1 (ORCPT ); Mon, 12 Dec 2022 18:19:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233721AbiLLXTR (ORCPT ); Mon, 12 Dec 2022 18:19:17 -0500 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1AA6A1C427 for ; Mon, 12 Dec 2022 15:19:16 -0800 (PST) Received: by mail-wr1-x434.google.com with SMTP id bx10so13950058wrb.0 for ; Mon, 12 Dec 2022 15:19:16 -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=iT8jy7hXGuLdSI3WnW19MAFpxEEAB5GqxCDkyx7KpM4=; b=cUahQ40RcUDkGUzRGkxzHyHQU7mw0Dw/6lFS2ZdFZshj40n6//A1f7WpfMrYcEg8io qsVU3XNft8MalTR85qKf178Mn8jLwJATYgo3PfF4ir4BX5DLEpBsG1XwvpNsgZj3KW8B 8zRTZLdvyYWmqNgOjqXfoXhIiG5sO9HSFsOxRur4kl41LxyIJAqG47zTpP/cOtK6KBzK Y2lHkzVBk+E8T7u1sRMQK4YYLd7hfdEfzEl4l1NWdLs8F2MbShL8WrdkyrOHIh6+LLx+ vjXQwKAriwqXC7Sg+PscaDXfAkkqS8w2HsXC6KqMo8OdD67AbR6J3i1+EOo7mqbeJX7f jZCQ== 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=iT8jy7hXGuLdSI3WnW19MAFpxEEAB5GqxCDkyx7KpM4=; b=ILFzFmzOI9K/Ra5c0TyEbELTafef5jnSnSrDy3Ox2zx51TgnkbQxfXGpKIJUebJ6lj P+UUpsHko/mlGKpyQy1K4TvotZn1obYYcdeFIvDSXFxY3SV6jBZ7p8p4hP3yAlxdh3q/ 4fgN6NkO7mARW+aKGGdIetEGETdD8ItD4m4KM+BMo+7OplKAv9tfJOd86oEx/ElEO2wN REn9tlXB/Yza4NcDle5TIguP8Lee7ZksPAChPibOdRCfWVLV2J3IXAfHFy/iASXkXiXQ 2U/Tvm2u+2b9LsDicfYUhNzfD9z8cHu4kMvKOR39pnTAiYAlSYfIc0Jpwk1KmO5L/Zrf sDpw== X-Gm-Message-State: ANoB5plIc92gDzB44+6CiSB5uuh3B7PdwR79PYV1I4Xa3ptTkDSI9Src s4JvQTUdrb5qPOM3LygKAtY= X-Google-Smtp-Source: AA0mqf5N4fUgLDL34+mtGBJX8uZcuRRYfH6gX+nt/hy2RO6nSEL62gRREzTDrpa19f0VQuGKBiWtwg== X-Received: by 2002:a5d:5a8b:0:b0:250:90fa:3da with SMTP id bp11-20020a5d5a8b000000b0025090fa03damr2318521wrb.29.1670887154645; Mon, 12 Dec 2022 15:19:14 -0800 (PST) Received: from localhost.localdomain (host-79-41-27-125.retail.telecomitalia.it. [79.41.27.125]) by smtp.gmail.com with ESMTPSA id v3-20020a5d6103000000b002423edd7e50sm9964304wrt.32.2022.12.12.15.19.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 15:19:13 -0800 (PST) From: "Fabio M. De Francesco" To: Evgeniy Dushistov , Al Viro , Ira Weiny , linux-kernel@vger.kernel.org Cc: "Fabio M. De Francesco" Subject: [PATCH v2 1/3] fs/ufs: Use the offset_in_page() helper Date: Tue, 13 Dec 2022 00:19:04 +0100 Message-Id: <20221212231906.19424-2-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221212231906.19424-1-fmdefrancesco@gmail.com> References: <20221212231906.19424-1-fmdefrancesco@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" 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/ufs/dir.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c index 391efaf1d528..69f78583c9c1 100644 --- a/fs/ufs/dir.c +++ b/fs/ufs/dir.c @@ -87,8 +87,7 @@ void ufs_set_link(struct inode *dir, struct ufs_dir_entry= *de, struct page *page, struct inode *inode, bool update_times) { - loff_t pos =3D page_offset(page) + - (char *) de - (char *) page_address(page); + loff_t pos =3D page_offset(page) + offset_in_page(de); unsigned len =3D fs16_to_cpu(dir->i_sb, de->d_reclen); int err; =20 @@ -371,8 +370,7 @@ int ufs_add_link(struct dentry *dentry, struct inode *i= node) return -EINVAL; =20 got_it: - pos =3D page_offset(page) + - (char*)de - (char*)page_address(page); + pos =3D page_offset(page) + offset_in_page(de); err =3D ufs_prepare_chunk(page, pos, rec_len); if (err) goto out_unlock; @@ -497,8 +495,8 @@ int ufs_delete_entry(struct inode *inode, struct ufs_di= r_entry *dir, { struct super_block *sb =3D inode->i_sb; char *kaddr =3D page_address(page); - unsigned from =3D ((char*)dir - kaddr) & ~(UFS_SB(sb)->s_uspi->s_dirblksi= ze - 1); - unsigned to =3D ((char*)dir - kaddr) + fs16_to_cpu(sb, dir->d_reclen); + unsigned int from =3D offset_in_page(dir) & ~(UFS_SB(sb)->s_uspi->s_dirbl= ksize - 1); + unsigned int to =3D offset_in_page(dir) + fs16_to_cpu(sb, dir->d_reclen); loff_t pos; struct ufs_dir_entry *pde =3D NULL; struct ufs_dir_entry *de =3D (struct ufs_dir_entry *) (kaddr + from); @@ -522,7 +520,7 @@ int ufs_delete_entry(struct inode *inode, struct ufs_di= r_entry *dir, de =3D ufs_next_entry(sb, de); } if (pde) - from =3D (char*)pde - (char*)page_address(page); + from =3D offset_in_page(pde); =20 pos =3D page_offset(page) + from; lock_page(page); --=20 2.38.1