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;
Date:   Thu, 29 Dec 2022 16:41:31 -0800
From:   Ira Weiny <ira.weiny@intel.com>
To:     "Fabio M. De Francesco" <fmdefrancesco@gmail.com>
CC:     Evgeniy Dushistov <dushistov@mail.ru>,
        Al Viro <viro@zeniv.linux.org.uk>,
        <linux-kernel@vger.kernel.org>, <bpf@vger.kernel.org>,
        <linux-fsdevel@vger.kernel.org>
Subject: Re: [PATCH v5 1/4] fs/ufs: Use the offset_in_page() helper
Message-ID: <Y64zu4ZIZ6E8iz9C@iweiny-desk3>
References: <20221229225100.22141-1-fmdefrancesco@gmail.com>
 <20221229225100.22141-2-fmdefrancesco@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20221229225100.22141-2-fmdefrancesco@gmail.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gWd1S8rnz4cwCWsMhTCaRNBD41fCcSZKmNZ/pF4rO/TDDHsjz/16lppFUO0M?=
 =?us-ascii?Q?KP6u5FBp8ucNRuT4v5VZE4wLIh2LtD7aNS5uU6u9n1gCJ4C0j900Tpd0Qblo?=
 =?us-ascii?Q?Hg+EJk92qyGIluO3XMxKJo0o1v/iNNCUjWU09CKOao+8nES/74Z1LXaPEuz5?=
 =?us-ascii?Q?JOTsqE/kz7yzKvy40utqkQ0GxZvRPfS2vqM+ZlICNbsaYY615zX/AIq6Eg8G?=
 =?us-ascii?Q?v1NFM+94sy9HCUvg+RDYs86EeQJSAf1qgaUU04fMBBY+t6XgI5kO/lV2tivL?=
 =?us-ascii?Q?GSru4gs5G5Pft2iLZ+7jYwdhS1iR91NqT2IvoVstoT6FBaT3UMCuyfLdBlU9?=
 =?us-ascii?Q?AWJz7wZUk1oZSMS0/KWXAfQoMfKtJ0qlmAoppctvx4v9uKLi2+2Gcpsr2x/0?=
 =?us-ascii?Q?KTQ3okpp+gVhmarJVWYqtx65BLoNs54g8RcWV+ngTd6WyQE7YIGXhSasXvhL?=
 =?us-ascii?Q?E5omyDW/C64n0BgPjE9fHc1YU6+I4yXfuVephhJQh9lnbyFvKjV6Um12MKpA?=
 =?us-ascii?Q?RnldZX79++19LZa/yDqu1OVwK7fF02cNDsDdiHBUSYEplQpxkAHG+jxd3ePy?=
 =?us-ascii?Q?X/6rfcV7l04sdZdOXP5RjqurajsMNItYmnfduOfykM8vZgLMjPyjQS5RT7nB?=
 =?us-ascii?Q?aMTxp2uVmCgjVfXS7IIhte7bOe49mdVBxcaenTEjHT0M+kFkyqM3bKwSJWX+?=
 =?us-ascii?Q?0TfIDUX4fw7ShfTWHl1xUbPGN7q4n9pUuwThw57DLpm2BoH37d9Lz7qLd3nf?=
 =?us-ascii?Q?V07FFG/hP0Wl8nSWTV/VsBTBW/Oa7c1UiSEMWL47y970oY9j5Ij/+/B6Lxu0?=
 =?us-ascii?Q?BD1IGNaWQmsPfCgw3r3tfQYvzy44GY5OrqSI79U8bBNF4tl69qEYc/Egrb5g?=
 =?us-ascii?Q?lE8mzEfXBDeGyROf6m/AvAI8IxO9hYJCUMCnYS7fXztcuyFnCCoQUkMOPm10?=
 =?us-ascii?Q?NmtONE0LSR9VYbK9ALZ3oGub2fcEHhUwJB3dqpmwO6LG76chLYax69Z/aSCU?=
 =?us-ascii?Q?smf6L9ir42HxTenQ188knY6cYBKL5/wyH8HGu/MM2rUv4HFBVrNQ64OcltGQ?=
 =?us-ascii?Q?ngjTy+GCGfaZcg9dthl2wGh5hZbnvgm/LH7IK3x/CpbG5xUvOt8ds4qLrL4m?=
 =?us-ascii?Q?N0zHO5W5JTpvMp5qmAn1df/NaQFeZPlW1ztlaON/gvK1G2INYVZx2n5pLkS9?=
 =?us-ascii?Q?6Jt5zxMPE+J/8vgndxqdzmkidO4OjOlTMwrwXxO22ZAf5qoM8dSyIX4S0U22?=
 =?us-ascii?Q?vR/XjJ085aF/rQbdmEJcbNwTjXNSQw04Frx2Xwf2/rWiHrZ6b7wPqx2sZQac?=
 =?us-ascii?Q?/StCKgaZusADkgArS6VgQMORymAZuZJujdDiaQyPNTY1fMmmwYrSYjsuu5o4?=
 =?us-ascii?Q?NH41K3qvtEQ09BIECvDu4OSxsgjxFMOAkZl9yJGeX4pOjrp0AKfSSexckWED?=
 =?us-ascii?Q?mIMVDb2/nyKqFnogJxk8GbcuZXyZUiUfj2VDxQsqDTwThhaVDAAAI0Hd5H+Q?=
 =?us-ascii?Q?fQ9wVKNlBhfjDSqjsDoqT+gtwH7amC5hUVRpoiZgQaxfQJHTaJ4/EF3il6EW?=
 =?us-ascii?Q?pmriVVxCaAwQUwt4Kjk4RjsWnhi7diMQWtoVeXGK?=
X-MS-Exchange-CrossTenant-Network-Message-Id: a1c78d95-dacc-4552-94f2-08dae9fe9b0f
X-MS-Exchange-CrossTenant-AuthSource: SA1PR11MB6733.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Dec 2022 00:41:36.0363
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: XohnIlOj4nvbpJxziS39awEzqnjgPsIY2/L/ITqsdcLUrAJBvMJzb+uTeHmnB81twKWtozm0d5LdaHp4JMTpQw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR11MB6200
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Dec 29, 2022 at 11:50:57PM +0100, Fabio M. De Francesco wrote:
> 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 <ira.weiny@intel.com>

Reviewed-by: Ira Weiny <ira.weiny@intel.com>

> Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
> Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
> ---
>  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 = page_offset(page) +
> -			(char *) de - (char *) page_address(page);
> +	loff_t pos = page_offset(page) + offset_in_page(de);
>  	unsigned len = fs16_to_cpu(dir->i_sb, de->d_reclen);
>  	int err;
>  
> @@ -371,8 +370,7 @@ int ufs_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);
>  	err = 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_dir_entry *dir,
>  {
>  	struct super_block *sb = inode->i_sb;
>  	char *kaddr = page_address(page);
> -	unsigned from = ((char*)dir - kaddr) & ~(UFS_SB(sb)->s_uspi->s_dirblksize - 1);
> -	unsigned to = ((char*)dir - kaddr) + fs16_to_cpu(sb, dir->d_reclen);
> +	unsigned int from = offset_in_page(dir) & ~(UFS_SB(sb)->s_uspi->s_dirblksize - 1);
> +	unsigned int to = offset_in_page(dir) + fs16_to_cpu(sb, dir->d_reclen);
>  	loff_t pos;
>  	struct ufs_dir_entry *pde = NULL;
>  	struct ufs_dir_entry *de = (struct ufs_dir_entry *) (kaddr + from);
> @@ -522,7 +520,7 @@ int ufs_delete_entry(struct inode *inode, struct ufs_dir_entry *dir,
>  		de = ufs_next_entry(sb, de);
>  	}
>  	if (pde)
> -		from = (char*)pde - (char*)page_address(page);
> +		from = offset_in_page(pde);
>  
>  	pos = page_offset(page) + from;
>  	lock_page(page);
> -- 
> 2.39.0
>