LU-4423 lnet: switch to kernel_sendmsg()

[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 5b0b2d3..f98ba64 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) 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -131,19 +131,13 @@ libcfs_psdev_release(struct inode * inode, struct file * file)
        return rc;
 }
 
-
-#ifdef HAVE_UNLOCKED_IOCTL
 static long libcfs_ioctl(struct file *file,
-                         unsigned int cmd, unsigned long arg)
-#else
-static int  libcfs_ioctl(struct inode *inode, struct file *file,
-                         unsigned int cmd, unsigned long arg)
-#endif
+                        unsigned int cmd, unsigned long arg)
 {
        struct cfs_psdev_file    pfile;
        int    rc = 0;
 
-       if (current_fsuid() != 0)
+       if (!capable(CAP_SYS_ADMIN))
                return -EACCES;
 
        if ( _IOC_TYPE(cmd) != IOC_LIBCFS_TYPE ||
@@ -177,16 +171,12 @@ static int  libcfs_ioctl(struct inode *inode, struct file *file,
 }
 
 static struct file_operations libcfs_fops = {
-#ifdef HAVE_UNLOCKED_IOCTL
-        unlocked_ioctl: libcfs_ioctl,
-#else
-        ioctl:          libcfs_ioctl,
-#endif
-        open :          libcfs_psdev_open,
-        release :       libcfs_psdev_release
+       unlocked_ioctl: libcfs_ioctl,
+       open :          libcfs_psdev_open,
+       release :       libcfs_psdev_release
 };
 
-cfs_psdev_t libcfs_dev = {
+struct miscdevice libcfs_dev = {
        LNET_MINOR,
        "lnet",
        &libcfs_fops