xfs: don't open-code u64_to_user_ptr

Commit Message

Darrick J. Wong May 21, 2024, 3:02 p.m. UTC

From: Darrick J. Wong <[e-mail]>

Don't open-code what the kernel already provides.

Signed-off-by: Darrick J. Wong <[e-mail]>
---
 fs/xfs/scrub/scrub.c |    2 +-
 fs/xfs/xfs_handle.c  |    7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

Comments

Christoph Hellwig May 21, 2024, 4:24 p.m. UTC | #1

On Tue, May 21, 2024 at 08:02:22AM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <[e-mail]>
> 
> Don't open-code what the kernel already provides.

Looks good:

Reviewed-by: Christoph Hellwig <[e-mail]>

I was actually looking for this in a few places and didn't find it
before suggesting the u64 as pointer API, but I couldn't find it.

Patch

diff --git a/fs/xfs/scrub/scrub.c b/fs/xfs/scrub/scrub.c
index 0004f71099b40..6a2c16a41ffee 100644
--- a/fs/xfs/scrub/scrub.c
+++ b/fs/xfs/scrub/scrub.c
@@ -947,7 +947,7 @@  xfs_ioc_scrubv_metadata(
 	if (vec_bytes > PAGE_SIZE)
 		return -ENOMEM;
 
-	uvectors = (void __user *)(uintptr_t)head.svh_vectors;
+	uvectors = u64_to_user_ptr(head.svh_vectors);
 	vectors = memdup_user(uvectors, vec_bytes);
 	if (IS_ERR(vectors))
 		return PTR_ERR(vectors);
diff --git a/fs/xfs/xfs_handle.c b/fs/xfs/xfs_handle.c
index c8785ed595434..a3f16e9b6fe5b 100644
--- a/fs/xfs/xfs_handle.c
+++ b/fs/xfs/xfs_handle.c
@@ -773,11 +773,6 @@  xfs_getparents_expand_lastrec(
 	trace_xfs_getparents_expand_lastrec(gpx->ip, gp, &gpx->context, gpr);
 }
 
-static inline void __user *u64_to_uptr(u64 val)
-{
-	return (void __user *)(uintptr_t)val;
-}
-
 /* Retrieve the parent pointers for a given inode. */
 STATIC int
 xfs_getparents(
@@ -862,7 +857,7 @@  xfs_getparents(
 	ASSERT(gpx->context.firstu <= gpx->gph.gph_request.gp_bufsize);
 
 	/* Copy the records to userspace. */
-	if (copy_to_user(u64_to_uptr(gpx->gph.gph_request.gp_buffer),
+	if (copy_to_user(u64_to_user_ptr(gpx->gph.gph_request.gp_buffer),
 				gpx->krecords, gpx->context.firstu))
 		error = -EFAULT;