xfs: don't open-code u64_to_user_ptr
PATCH 1/1 xfs: don't open-code u64_to_user_ptr
From: Darrick J. Wong <[email protected]>
Don't open-code what the kernel already provides.
Signed-off-by Darrick J. Wong <[email protected]>
--- fs/xfs/scrub/scrub.c | 2 +- fs/xfs/xfs_handle.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-)
fs/xfs/scrub/scrub.c +1 -1
@@ -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);
fs/xfs/xfs_handle.c +1 -6
@@ -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 ;
Quoted 3 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Don't open-code what the kernel already provides.
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>
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.