b=16150

[fs/lustre-release.git] / libcfs / libcfs / winnt / winnt-module.c

diff --git a/libcfs/libcfs/winnt/winnt-module.c b/libcfs/libcfs/winnt/winnt-module.c
index ac255ba..3febc7f 100644 (file)
--- a/libcfs/libcfs/winnt/winnt-module.c
+++ b/libcfs/libcfs/winnt/winnt-module.c
@@ -35,7 +35,7 @@
  */
 
 
-#define DEBUG_SUBSYSTEM S_LIBCFS
+#define DEBUG_SUBSYSTEM S_LNET
 
 #include <libcfs/libcfs.h>
 
@@ -56,17 +56,17 @@ int libcfs_ioctl_getdata(char *buf, char *end, void *arg)
                 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);
         }
 
@@ -75,7 +75,7 @@ int libcfs_ioctl_getdata(char *buf, char *end, void *arg)
                 RETURN(err);
 
         if (libcfs_ioctl_is_invalid(data)) {
-                CERROR(("LIBCFS: ioctl not correctly formatted\n"));
+                CERROR("LIBCFS: ioctl not correctly formatted\n");
                 RETURN(-EINVAL);
         }
 
@@ -88,11 +88,18 @@ int libcfs_ioctl_getdata(char *buf, char *end, void *arg)
 
         RETURN(0);
 }
-                                                                                                                                                                        
+
+int libcfs_ioctl_popdata(void *arg, void *data, int size)
+{
+       if (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;
@@ -107,7 +114,7 @@ libcfs_psdev_open(cfs_file_t * file)
 
 /* 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;
@@ -121,7 +128,7 @@ libcfs_psdev_release(cfs_file_t * file)
 }
 
 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;
@@ -129,8 +136,8 @@ libcfs_ioctl(cfs_file_t * file, unsigned int cmd, ulong_ptr arg)
        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); 
        } 
        
@@ -139,8 +146,8 @@ libcfs_ioctl(cfs_file_t * file, unsigned int cmd, ulong_ptr arg)
        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:
@@ -160,6 +167,7 @@ libcfs_ioctl(cfs_file_t * file, unsigned int cmd, ulong_ptr arg)
 }
 
 static struct file_operations libcfs_fops = {
+    /* owner */   THIS_MODULE,
     /* lseek: */  NULL,
     /* read: */   NULL,
     /* write: */  NULL,