* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
*/
-#define DEBUG_SUBSYSTEM S_LIBCFS
+#define DEBUG_SUBSYSTEM S_LNET
#include <libcfs/libcfs.h>
hdr = (struct libcfs_ioctl_hdr *)buf;
data = (struct libcfs_ioctl_data *)buf;
- err = copy_from_user(buf, (void *)arg, sizeof(*hdr));
+ err = cfs_copy_from_user(buf, (void *)arg, sizeof(*hdr));
if (err)
RETURN(err);
if (hdr->ioc_version != LIBCFS_IOCTL_VERSION) {
- CERROR(("LIBCFS: version mismatch kernel vs application\n"));
+ CERROR("LIBCFS: version mismatch kernel vs application\n");
RETURN(-EINVAL);
}
if (hdr->ioc_len + buf >= end) {
- CERROR(("LIBCFS: user buffer exceeds kernel buffer\n"));
+ CERROR("LIBCFS: user buffer exceeds kernel buffer\n");
RETURN(-EINVAL);
}
if (hdr->ioc_len < sizeof(struct libcfs_ioctl_data)) {
- CERROR(("LIBCFS: user buffer too small for ioctl\n"));
+ CERROR("LIBCFS: user buffer too small for ioctl\n");
RETURN(-EINVAL);
}
- err = copy_from_user(buf, (void *)arg, hdr->ioc_len);
+ err = cfs_copy_from_user(buf, (void *)arg, hdr->ioc_len);
if (err)
RETURN(err);
if (libcfs_ioctl_is_invalid(data)) {
- CERROR(("LIBCFS: ioctl not correctly formatted\n"));
+ CERROR("LIBCFS: ioctl not correctly formatted\n");
RETURN(-EINVAL);
}
if (data->ioc_inllen2)
data->ioc_inlbuf2 = &data->ioc_bulk[0] +
- size_round(data->ioc_inllen1);
+ cfs_size_round(data->ioc_inllen1);
RETURN(0);
}
-
+
+int libcfs_ioctl_popdata(void *arg, void *data, int size)
+{
+ if (cfs_copy_to_user((char *)arg, data, size))
+ return -EFAULT;
+ return 0;
+}
+
extern struct cfs_psdev_ops libcfs_psdev_ops;
static int
-libcfs_psdev_open(cfs_file_t * file)
+libcfs_psdev_open(struct inode *in, cfs_file_t * file)
{
struct libcfs_device_userstate **pdu = NULL;
int rc = 0;
/* called when closing /dev/device */
static int
-libcfs_psdev_release(cfs_file_t * file)
+libcfs_psdev_release(struct inode *in, cfs_file_t * file)
{
struct libcfss_device_userstate *pdu;
int rc = 0;
}
static int
-libcfs_ioctl(cfs_file_t * file, unsigned int cmd, ulong_ptr arg)
+libcfs_ioctl(cfs_file_t * file, unsigned int cmd, ulong_ptr_t arg)
{
struct cfs_psdev_file pfile;
int rc = 0;
if ( _IOC_TYPE(cmd) != IOC_LIBCFS_TYPE ||
_IOC_NR(cmd) < IOC_LIBCFS_MIN_NR ||
_IOC_NR(cmd) > IOC_LIBCFS_MAX_NR ) {
- CDEBUG(D_IOCTL, ("invalid ioctl ( type %d, nr %d, size %d )\n",
- _IOC_TYPE(cmd), _IOC_NR(cmd), _IOC_SIZE(cmd)));
+ CDEBUG(D_IOCTL, "invalid ioctl ( type %d, nr %d, size %d )\n",
+ _IOC_TYPE(cmd), _IOC_NR(cmd), _IOC_SIZE(cmd));
return (-EINVAL);
}
case IOC_LIBCFS_PANIC:
if (!cfs_capable(CFS_CAP_SYS_BOOT))
return (-EPERM);
- CERROR(("debugctl-invoked panic"));
- KeBugCheckEx('LUFS', (ULONG_PTR)libcfs_ioctl, (ULONG_PTR)NULL, (ULONG_PTR)NULL, (ULONG_PTR)NULL);
+ CERROR("debugctl-invoked panic");
+ KeBugCheckEx('LUFS', (ULONG_PTR)libcfs_ioctl, (ULONG_PTR)NULL, (ULONG_PTR)NULL, (ULONG_PTR)NULL);
return (0);
case IOC_LIBCFS_MEMHOG:
}
static struct file_operations libcfs_fops = {
+ /* owner */ THIS_MODULE,
/* lseek: */ NULL,
/* read: */ NULL,
/* write: */ NULL,