staging: lustre: uapi: remove obd_ioctl_popdata() wrapper

[linux-2.6-block.git] / drivers / staging / lustre / lustre / obdclass / class_obd.c

diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c
index 8cc1fdcfcf777d97aa21a007ee48bb5d26f33d52..477d611a92b084761df5e7633c13476f332ffe5c 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
@@ -206,8 +206,7 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg)
                memcpy(data->ioc_bulk, LUSTRE_VERSION_STRING,
                       strlen(LUSTRE_VERSION_STRING) + 1);
 
-               err = obd_ioctl_popdata((void __user *)arg, data, len);
-               if (err)
+               if (copy_to_user((void __user *)arg, data, len))
                        err = -EFAULT;
                goto out;
 
@@ -225,9 +224,7 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg)
                        goto out;
                }
 
-               err = obd_ioctl_popdata((void __user *)arg, data,
-                                       sizeof(*data));
-               if (err)
+               if (copy_to_user((void __user *)arg, data, sizeof(*data)))
                        err = -EFAULT;
                goto out;
        }
@@ -263,8 +260,8 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg)
 
                CDEBUG(D_IOCTL, "device name %s, dev %d\n", data->ioc_inlbuf1,
                       dev);
-               err = obd_ioctl_popdata((void __user *)arg, data,
-                                       sizeof(*data));
+
+               if (copy_to_user((void __user *)arg, data, sizeof(*data)))
                if (err)
                        err = -EFAULT;
                goto out;
@@ -304,9 +301,9 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg)
                         (int)index, status, obd->obd_type->typ_name,
                         obd->obd_name, obd->obd_uuid.uuid,
                         atomic_read(&obd->obd_refcount));
-               err = obd_ioctl_popdata((void __user *)arg, data, len);
 
-               err = 0;
+               if (copy_to_user((void __user *)arg, data, len))
+                       err = -EFAULT;
                goto out;
        }
        }
@@ -361,8 +358,7 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg)
                if (err)
                        goto out;
 
-               err = obd_ioctl_popdata((void __user *)arg, data, len);
-               if (err)
+               if (copy_to_user((void __user *)arg, data, len))
                        err = -EFAULT;
                goto out;
        }