diff options
Diffstat (limited to 'drivers/staging/lustre/lustre/libcfs/linux/linux-module.c')
| -rw-r--r-- | drivers/staging/lustre/lustre/libcfs/linux/linux-module.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c index 581b4728c6ca..de3c199654a0 100644 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c @@ -36,7 +36,7 @@ #define DEBUG_SUBSYSTEM S_LNET -#include <linux/libcfs/libcfs.h> +#include "../../../include/linux/libcfs/libcfs.h" #define LNET_MINOR 240 @@ -99,7 +99,7 @@ int libcfs_ioctl_popdata(void *arg, void *data, int size) extern struct cfs_psdev_ops libcfs_psdev_ops; static int -libcfs_psdev_open(struct inode * inode, struct file * file) +libcfs_psdev_open(struct inode *inode, struct file *file) { struct libcfs_device_userstate **pdu = NULL; int rc = 0; @@ -116,7 +116,7 @@ libcfs_psdev_open(struct inode * inode, struct file * file) /* called when closing /dev/device */ static int -libcfs_psdev_release(struct inode * inode, struct file * file) +libcfs_psdev_release(struct inode *inode, struct file *file) { struct libcfs_device_userstate *pdu; int rc = 0; @@ -140,9 +140,9 @@ static long libcfs_ioctl(struct file *file, if (!capable(CAP_SYS_ADMIN)) return -EACCES; - if ( _IOC_TYPE(cmd) != IOC_LIBCFS_TYPE || + if (_IOC_TYPE(cmd) != IOC_LIBCFS_TYPE || _IOC_NR(cmd) < IOC_LIBCFS_MIN_NR || - _IOC_NR(cmd) > IOC_LIBCFS_MAX_NR ) { + _IOC_NR(cmd) > IOC_LIBCFS_MAX_NR) { CDEBUG(D_IOCTL, "invalid ioctl ( type %d, nr %d, size %d )\n", _IOC_TYPE(cmd), _IOC_NR(cmd), _IOC_SIZE(cmd)); return (-EINVAL); @@ -154,7 +154,7 @@ static long libcfs_ioctl(struct file *file, if (!capable(CFS_CAP_SYS_BOOT)) return (-EPERM); panic("debugctl-invoked panic"); - return (0); + return 0; case IOC_LIBCFS_MEMHOG: if (!capable(CFS_CAP_SYS_ADMIN)) return -EPERM; @@ -167,10 +167,10 @@ static long libcfs_ioctl(struct file *file, rc = libcfs_psdev_ops.p_ioctl(&pfile, cmd, (void *)arg); else rc = -EPERM; - return (rc); + return rc; } -static struct file_operations libcfs_fops = { +static const struct file_operations libcfs_fops = { .unlocked_ioctl = libcfs_ioctl, .open = libcfs_psdev_open, .release = libcfs_psdev_release, |