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

staging:lustre: remove libcfs_psdev_[open|release]

Browse Source 
With struct libcfs_device_userstate gone we can remove
the remaining code of libcfs_psdev_ops.p_[open|close]
as well as the libcfs_psdev_[open|release] functions.

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:06 -04:00 committed by Greg Kroah-Hartman
parent c878547fdf
commit 4678d183ca
3 changed files with 1 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,8 +73,6 @@ struct cfs_psdev_file {
};
struct cfs_psdev_ops {
int (*p_open)(unsigned long, void *);
int (*p_close)(unsigned long, void *);
int (*p_read)(struct cfs_psdev_file *, char *, unsigned long);
int (*p_write)(struct cfs_psdev_file *, char *, unsigned long);
int (*p_ioctl)(struct cfs_psdev_file *, unsigned long, void __user *);

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

@ -95,35 +95,6 @@ int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp,
return err;
}
static int
libcfs_psdev_open(struct inode *inode, struct file *file)
{
int rc = 0;
if (!inode)
return -EINVAL;
if (libcfs_psdev_ops.p_open)
rc = libcfs_psdev_ops.p_open(0, NULL);
else
return -EPERM;
return rc;
}
/* called when closing /dev/device */
static int
libcfs_psdev_release(struct inode *inode, struct file *file)
{
int rc = 0;
if (!inode)
return -EINVAL;
if (libcfs_psdev_ops.p_close)
rc = libcfs_psdev_ops.p_close(0, NULL);
else
rc = -EPERM;
return rc;
}
static long libcfs_ioctl(struct file *file,
unsigned int cmd, unsigned long arg)
{
@ -149,9 +120,8 @@ static long libcfs_ioctl(struct file *file,
}
static const struct file_operations libcfs_fops = {
.owner = THIS_MODULE,
.unlocked_ioctl = libcfs_ioctl,
.open = libcfs_psdev_open,
.release = libcfs_psdev_release,
};
struct miscdevice libcfs_dev = {

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

@ -65,20 +65,6 @@
static struct dentry *lnet_debugfs_root;
/* called when opening /dev/device */
static int libcfs_psdev_open(unsigned long flags, void *args)
{
try_module_get(THIS_MODULE);
return 0;
}
/* called when closing /dev/device */
static int libcfs_psdev_release(unsigned long flags, void *args)
{
module_put(THIS_MODULE);
return 0;
}
static DECLARE_RWSEM(ioctl_list_sem);
static LIST_HEAD(ioctl_list);
@ -180,8 +166,6 @@ out:
}
struct cfs_psdev_ops libcfs_psdev_ops = {
libcfs_psdev_open,
libcfs_psdev_release,
NULL,
NULL,
libcfs_ioctl