LU-2456 lnet: DLC Feature dynamic net config

[fs/lustre-release.git] / lustre / obdclass / darwin / darwin-module.c

diff --git a/lustre/obdclass/darwin/darwin-module.c b/lustre/obdclass/darwin/darwin-module.c
index f67ae0e..faf2815 100644 (file)
--- a/lustre/obdclass/darwin/darwin-module.c
+++ b/lustre/obdclass/darwin/darwin-module.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -35,9 +35,6 @@
  */
 
 #define DEBUG_SUBSYSTEM S_CLASS
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 
 #include <mach/mach_types.h>
 #include <string.h>
@@ -51,7 +48,11 @@
 #include <lprocfs_status.h>
 
 #ifndef OBD_MAX_IOCTL_BUFFER
-#define OBD_MAX_IOCTL_BUFFER 8192
+#ifdef CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER
+#define OBD_MAX_IOCTL_BUFFER   CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER
+#else
+#define OBD_MAX_IOCTL_BUFFER   8192
+#endif
 #endif
 
 /* buffer MUST be at least the size of obd_ioctl_hdr */
@@ -80,9 +81,7 @@ int obd_ioctl_getdata(char **buf, int *len, void *arg)
                 RETURN(-EINVAL);
         }
 
-        /* XXX allocate this more intelligently, using kmalloc when
-         * appropriate */
-        OBD_VMALLOC(*buf, hdr->ioc_len);
+        OBD_ALLOC_LARGE(*buf, hdr->ioc_len);
         if (*buf == NULL) {
                 CERROR("Cannot allocate control buffer of len %d\n",
                        hdr->ioc_len);
@@ -99,6 +98,7 @@ int obd_ioctl_getdata(char **buf, int *len, void *arg)
 
         if (obd_ioctl_is_invalid(data)) {
                 CERROR("ioctl not correctly formatted\n");
+                OBD_FREE_LARGE(*buf, hdr->ioc_len);
                 return -EINVAL;
         }
 
@@ -145,26 +145,22 @@ int obd_ioctl_popdata(void *arg, void *data, int len)
                return err;
        }
 }
-/*
- * cfs pseudo device
- */
-extern struct cfs_psdev_ops          obd_psdev_ops;
 
 static int
 obd_class_open(dev_t dev, int flags, int devtype, struct proc *p)
 {
-       if (obd_psdev_ops.p_open != NULL)
-               return -obd_psdev_ops.p_open(0, NULL);
-       return EPERM;
+       ENTRY;
+
+       RETURN(0);
 }
 
 /*  closing /dev/obd */
 static int
 obd_class_release(dev_t dev, int flags, int mode, struct proc *p)
 {
-       if (obd_psdev_ops.p_close != NULL)
-               return -obd_psdev_ops.p_close(0, NULL);
-       return EPERM;
+       ENTRY;
+
+       RETURN(0);
 }
 
 static int
@@ -175,10 +171,8 @@ obd_class_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct proc *p)
 
        if (!is_suser())
                RETURN (EPERM);
-       if (obd_psdev_ops.p_ioctl != NULL)
-               err = -obd_psdev_ops.p_ioctl(NULL, cmd, (void *)arg);
-       else
-               err = EPERM;
+
+       err = class_handle_ioctl(cmd, (unsigned long)arg);
 
        RETURN(err);
 }
@@ -199,7 +193,7 @@ static struct cdevsw obd_psdevsw = {
        NULL,
 };
 
-cfs_psdev_t obd_psdev = {
+struct miscdevice obd_psdev = {
        -1,
        NULL,
        "obd",