-/* -*- 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.
* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
if (data->ioc_inllen2)
data->ioc_inlbuf2 = &data->ioc_bulk[0] +
- size_round(data->ioc_inllen1);
+ cfs_size_round(data->ioc_inllen1);
RETURN(0);
}
return rc;
}
-static int
-libcfs_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
+
+#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
{
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 ||
}
static struct file_operations libcfs_fops = {
- ioctl: libcfs_ioctl,
- open: libcfs_psdev_open,
- release: libcfs_psdev_release
+#ifdef HAVE_UNLOCKED_IOCTL
+ unlocked_ioctl: libcfs_ioctl,
+#else
+ ioctl: libcfs_ioctl,
+#endif
+ open : libcfs_psdev_open,
+ release : libcfs_psdev_release
};
cfs_psdev_t libcfs_dev = {