Commit 95b19e2f authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Chandan Babu R
Browse files

xfs: don't open-code u64_to_user_ptr 



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

Signed-off-by: default avatar"Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarChandan Babu R <chandanbabu@kernel.org>
parent 38de5679

fs/xfs/scrub/scrub.c

+1 −1
Original line number Diff line number Diff line
@@ -856,7 +856,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
Original line number Diff line number Diff line
@@ -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;