LU-5935 lnet: Fixes to make lnetctl function as expected.

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

diff --git a/libcfs/libcfs/linux/linux-module.c b/libcfs/libcfs/linux/linux-module.c
index 668e3c5..7175e44 100644 (file)
--- a/libcfs/libcfs/linux/linux-module.c
+++ b/libcfs/libcfs/linux/linux-module.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *

- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.

  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/


@@ -76,7 +76,7 @@ int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp,
                RETURN(-EINVAL);
        }
 
                RETURN(-EINVAL);
        }
 

-       if (hdr.ioc_len < sizeof(struct libcfs_ioctl_data)) {
+       if (hdr.ioc_len < sizeof(struct libcfs_ioctl_hdr)) {

                CERROR("libcfs ioctl: user buffer too small for ioctl\n");
                RETURN(-EINVAL);
        }
                CERROR("libcfs ioctl: user buffer too small for ioctl\n");
                RETURN(-EINVAL);
        }


@@ -100,8 +100,6 @@ failed:
        RETURN(err);
 }
 
        RETURN(err);
 }
 

-extern struct cfs_psdev_ops          libcfs_psdev_ops;
-

 static int
 libcfs_psdev_open(struct inode * inode, struct file * file)
 {
 static int
 libcfs_psdev_open(struct inode * inode, struct file * file)
 {