Commit 4678d183 authored by Parinay Kondekar's avatar Parinay Kondekar Committed by Greg Kroah-Hartman

staging:lustre: remove libcfs_psdev_[open|release]

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: default avatarParinay Kondekar <parinay.kondekar@seagate.com>
Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5844
Reviewed-on: http://review.whamcloud.com/17492Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c878547f
...@@ -73,8 +73,6 @@ struct cfs_psdev_file { ...@@ -73,8 +73,6 @@ struct cfs_psdev_file {
}; };
struct cfs_psdev_ops { 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_read)(struct cfs_psdev_file *, char *, unsigned long);
int (*p_write)(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 *); int (*p_ioctl)(struct cfs_psdev_file *, unsigned long, void __user *);
......
...@@ -95,35 +95,6 @@ int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp, ...@@ -95,35 +95,6 @@ int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp,
return err; 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, static long libcfs_ioctl(struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
...@@ -149,9 +120,8 @@ static long libcfs_ioctl(struct file *file, ...@@ -149,9 +120,8 @@ static long libcfs_ioctl(struct file *file,
} }
static const struct file_operations libcfs_fops = { static const struct file_operations libcfs_fops = {
.owner = THIS_MODULE,
.unlocked_ioctl = libcfs_ioctl, .unlocked_ioctl = libcfs_ioctl,
.open = libcfs_psdev_open,
.release = libcfs_psdev_release,
}; };
struct miscdevice libcfs_dev = { struct miscdevice libcfs_dev = {
......
...@@ -65,20 +65,6 @@ ...@@ -65,20 +65,6 @@
static struct dentry *lnet_debugfs_root; 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 DECLARE_RWSEM(ioctl_list_sem);
static LIST_HEAD(ioctl_list); static LIST_HEAD(ioctl_list);
...@@ -180,8 +166,6 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, ...@@ -180,8 +166,6 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd,
} }
struct cfs_psdev_ops libcfs_psdev_ops = { struct cfs_psdev_ops libcfs_psdev_ops = {
libcfs_psdev_open,
libcfs_psdev_release,
NULL, NULL,
NULL, NULL,
libcfs_ioctl libcfs_ioctl
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment