Commit 5206726a authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

staging: lustre: libcfs: remove libcfs_ioctl_popdata wrapper 



Lets just use copy_to_user() directly instead of having a
wrapper function.

Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Signed-off-by: default avatarJames Simmons <uja.ornl@gmail.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6245
Reviewed-on: http://review.whamcloud.com/14180


Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarfrank zago <fzago@cray.com>
Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7b54d08b

drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h

+0 −1
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ static inline bool libcfs_ioctl_is_invalid(struct libcfs_ioctl_data *data) 


int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp,

			 const struct libcfs_ioctl_hdr __user *uparam);

int libcfs_ioctl_popdata(void __user *arg, void *buf, int size);

int libcfs_ioctl_data_adjust(struct libcfs_ioctl_data *data);



#endif /* __LIBCFS_IOCTL_H__ */

drivers/staging/lustre/lnet/libcfs/linux/linux-module.c

+0 −7
Original line number Diff line number Diff line
@@ -95,13 +95,6 @@ int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp, 
	return err;

}



int libcfs_ioctl_popdata(void __user *arg, void *data, int size)

{

	if (copy_to_user(arg, data, size))

		return -EFAULT;

	return 0;

}



static int

libcfs_psdev_open(struct inode *inode, struct file *file)

{

drivers/staging/lustre/lnet/libcfs/module.c

+4 −3
Original line number Diff line number Diff line
@@ -168,9 +168,10 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, 
			if (err == -EINVAL)

				continue;



			if (!err)

				err = libcfs_ioctl_popdata(uparam, hdr,

							   hdr->ioc_len);

			if (!err) {

				if (copy_to_user(uparam, hdr, hdr->ioc_len))

					err = -EFAULT;

			}

			break;

		}

		up_read(&ioctl_list_sem);

CRA Git | Maintained and supported by SUSTech CRA and CCSE