leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging:lustre: remove libcfs pseudo device abstraction

Browse Source 
With the libcfs ioctl cleanup we no longer need the libcfs
pseudo device abstraction.

Signed-off-by: Parinay Kondekar <parinay.kondekar@seagate.com>
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5844
Reviewed-on: http://review.whamcloud.com/17492
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Parinay Kondekar 2016-03-22 19:04:08 -04:00 committed by Greg Kroah-Hartman
parent ae272a48a1
commit 89010fbc22
3 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/lustre/include/linux/libcfs/libcfs.h
View File

@ -59,24 +59,6 @@
#define LNET_ACCEPTOR_MIN_RESERVED_PORT 512
#define LNET_ACCEPTOR_MAX_RESERVED_PORT 1023
/*
* libcfs pseudo device operations
*
* It's just draft now.
*/
struct cfs_psdev_file {
unsigned long off;
void *private_data;
unsigned long reserved1;
unsigned long reserved2;
};
struct cfs_psdev_ops {
int (*p_read)(struct cfs_psdev_file *, char *, unsigned long);
int (*p_write)(struct cfs_psdev_file *, char *, unsigned long);
};
/*
* Drop into debugger, if possible. Implementation is provided by platform.
*/
@ -130,7 +112,7 @@ struct libcfs_ioctl_handler {
int libcfs_register_ioctl(struct libcfs_ioctl_handler *hand);
int libcfs_deregister_ioctl(struct libcfs_ioctl_handler *hand);
int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *arg);
int libcfs_ioctl(unsigned long cmd, void *arg);
/* container_of depends on "likely" which is defined in libcfs_private.h */
static inline void *__container_of(void *ptr, unsigned long shift)
@ -156,8 +138,6 @@ extern struct miscdevice libcfs_dev;
extern char lnet_upcall[1024];
extern char lnet_debug_log_upcall[1024];
extern struct cfs_psdev_ops libcfs_psdev_ops;
extern struct cfs_wi_sched *cfs_sched_rehash;
struct lnet_debugfs_symlink_def {

4
drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
View File

@ -98,8 +98,6 @@ int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp,
static long
libcfs_psdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
struct cfs_psdev_file pfile;
if (!capable(CAP_SYS_ADMIN))
return -EACCES;
@ -111,7 +109,7 @@ libcfs_psdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return -EINVAL;
}
return libcfs_ioctl(&pfile, cmd, (void __user *)arg);
return libcfs_ioctl(cmd, (void __user *)arg);
}
static const struct file_operations libcfs_fops = {

8
drivers/staging/lustre/lnet/libcfs/module.c
View File

@ -98,8 +98,7 @@ int libcfs_deregister_ioctl(struct libcfs_ioctl_handler *hand)
}
EXPORT_SYMBOL(libcfs_deregister_ioctl);
int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd,
void __user *uparam)
int libcfs_ioctl(unsigned long cmd, void __user *uparam)
{
struct libcfs_ioctl_data *data = NULL;
struct libcfs_ioctl_hdr *hdr;
@ -165,11 +164,6 @@ out:
return err;
}
struct cfs_psdev_ops libcfs_psdev_ops = {
NULL,
NULL,
};
int lprocfs_call_handler(void *data, int write, loff_t *ppos,
void __user *buffer, size_t *lenp,
int (*handler)(void *data, int write, loff_t pos,