diff options
Diffstat (limited to 'drivers/staging/lustre/lustre/libcfs/module.c')
| -rw-r--r-- | drivers/staging/lustre/lustre/libcfs/module.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c index 3396858098b0..2c4fc74505bc 100644 --- a/drivers/staging/lustre/lustre/libcfs/module.c +++ b/drivers/staging/lustre/lustre/libcfs/module.c @@ -119,7 +119,7 @@ kportal_memhog_alloc(struct libcfs_device_userstate *ldu, int npages, count1 < PAGE_CACHE_SIZE/sizeof(struct page *)) { if (cfs_signal_pending()) - return (-EINTR); + return -EINTR; *level1p = alloc_page(flags); if (*level1p == NULL) @@ -134,11 +134,11 @@ kportal_memhog_alloc(struct libcfs_device_userstate *ldu, int npages, count2 < PAGE_CACHE_SIZE/sizeof(struct page *)) { if (cfs_signal_pending()) - return (-EINTR); + return -EINTR; *level2p = alloc_page(flags); if (*level2p == NULL) - return (-ENOMEM); + return -ENOMEM; ldu->ldu_memhog_pages++; level2p++; @@ -217,7 +217,7 @@ int libcfs_deregister_ioctl(struct libcfs_ioctl_handler *hand) } EXPORT_SYMBOL(libcfs_deregister_ioctl); -static int libcfs_ioctl_int(struct cfs_psdev_file *pfile,unsigned long cmd, +static int libcfs_ioctl_int(struct cfs_psdev_file *pfile, unsigned long cmd, void *arg, struct libcfs_ioctl_data *data) { int err = -EINVAL; @@ -301,7 +301,8 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *a /* 'cmd' and permissions get checked in our arch-specific caller */ if (libcfs_ioctl_getdata(buf, buf + 800, (void *)arg)) { CERROR("PORTALS ioctl: data error\n"); - GOTO(out, err = -EINVAL); + err = -EINVAL; + goto out; } data = (struct libcfs_ioctl_data *)buf; @@ -351,7 +352,7 @@ static int init_libcfs_module(void) rc = libcfs_debug_init(5 * 1024 * 1024); if (rc < 0) { printk(KERN_ERR "LustreError: libcfs_debug_init: %d\n", rc); - return (rc); + return rc; } rc = cfs_cpu_init(); |