b=16774 cancel unused osc locks before replay.

[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 9a3ee14..d290172 100644 (file)
--- a/libcfs/libcfs/linux/linux-module.c
+++ b/libcfs/libcfs/linux/linux-module.c
@@ -1,3 +1,39 @@
+/* -*- 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.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ */
+
 #define DEBUG_SUBSYSTEM S_LNET
 
 #include <libcfs/libcfs.h>
@@ -48,7 +84,7 @@ int libcfs_ioctl_getdata(char *buf, char *end, void *arg)
 
         if (data->ioc_inllen2)
                 data->ioc_inlbuf2 = &data->ioc_bulk[0] +
-                        size_round(data->ioc_inllen1);
+                        cfs_size_round(data->ioc_inllen1);
 
         RETURN(0);
 }
@@ -102,7 +138,7 @@ libcfs_ioctl(struct inode *inode, struct file *file,
        struct cfs_psdev_file    pfile;
        int    rc = 0;
 
-       if (current->fsuid != 0)
+       if (current_fsuid() != 0)
                return -EACCES;
 
        if ( _IOC_TYPE(cmd) != IOC_LIBCFS_TYPE ||
@@ -116,12 +152,12 @@ libcfs_ioctl(struct inode *inode, struct file *file,
        /* Handle platform-dependent IOC requests */
        switch (cmd) {
        case IOC_LIBCFS_PANIC:
-               if (!capable (CAP_SYS_BOOT))
+               if (!cfs_capable(CFS_CAP_SYS_BOOT))
                        return (-EPERM);
                panic("debugctl-invoked panic");
                return (0);
        case IOC_LIBCFS_MEMHOG:
-               if (!capable (CAP_SYS_ADMIN))
+               if (!cfs_capable(CFS_CAP_SYS_ADMIN))
                        return -EPERM;
                /* go thought */
        }
@@ -146,5 +182,3 @@ cfs_psdev_t libcfs_dev = {
        "lnet",
        &libcfs_fops
 };
-
-