lkml.org 
[lkml]   [2016]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 6/7] staging:lustre: call libcfs_ioctl directly
Date
From: Parinay Kondekar <parinay.kondekar@seagate.com>

No reason to go through the cfs_psdev_ops abstract
to call libcfs_ioctl. Just call libcfs_ioctl directly.

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>
---
.../staging/lustre/include/linux/libcfs/libcfs.h | 2 +-
.../lustre/lustre/libcfs/linux/linux-module.c | 13 ++++---------
drivers/staging/lustre/lustre/libcfs/module.c | 4 ++--
3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
index 06bb676..38d65ee 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
@@ -75,8 +75,8 @@ struct cfs_psdev_file {
struct cfs_psdev_ops {
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 *);
};
+int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *arg);

/*
* Drop into debugger, if possible. Implementation is provided by platform.
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c
index 64f0fbf..0710d0b 100644
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c
@@ -116,11 +116,10 @@ libcfs_psdev_release(struct inode *inode, struct file *file)
return 0;
}

-static long libcfs_ioctl(struct file *file,
- unsigned int cmd, unsigned long arg)
+static long
+libcfs_psdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
struct cfs_psdev_file pfile;
- int rc = 0;

if (!capable(CAP_SYS_ADMIN))
return -EACCES;
@@ -135,15 +134,11 @@ static long libcfs_ioctl(struct file *file,

pfile.off = 0;
pfile.private_data = file->private_data;
- if (libcfs_psdev_ops.p_ioctl != NULL)
- rc = libcfs_psdev_ops.p_ioctl(&pfile, cmd, (void *)arg);
- else
- rc = -EPERM;
- return rc;
+ return libcfs_ioctl(&pfile, cmd, (void __user *)arg);
}

static const struct file_operations libcfs_fops = {
- .unlocked_ioctl = libcfs_ioctl,
+ .unlocked_ioctl = libcfs_psdev_ioctl,
.open = libcfs_psdev_open,
.release = libcfs_psdev_release,
};
diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
index 8a8a533..63b2b37 100644
--- a/drivers/staging/lustre/lustre/libcfs/module.c
+++ b/drivers/staging/lustre/lustre/libcfs/module.c
@@ -140,7 +140,8 @@ static int libcfs_ioctl_int(struct cfs_psdev_file *pfile, unsigned long cmd,
return err;
}

-static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *arg)
+int
+libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *arg)
{
char *buf;
struct libcfs_ioctl_data *data;
@@ -168,7 +169,6 @@ out:
struct cfs_psdev_ops libcfs_psdev_ops = {
NULL,
NULL,
- libcfs_ioctl
};

static int proc_call_handler(void *data, int write, loff_t *ppos,
--
1.7.1


\
 
 \ /
  Last update: 2016-01-05 21:01    [W:0.413 / U:0.024 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site