From a8336afa4c1f61552ec95b5302fdb0b20f615355 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Fri, 21 Apr 2017 00:57:10 +0000 Subject: [PATCH] iscsi-scst: change local names of ioctl() and open() to not conflict Change local names of ioctl() and open() to not conflict with C library names. This isn't really a bug in a strictly kernel-resident build, but the change avoids symbol conflicts with libc when building for usermode. Signed-off-by: David Butterfield with some changes git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7138 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/config.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/iscsi-scst/kernel/config.c b/iscsi-scst/kernel/config.c index b4c7e842e..3c2d9f425 100644 --- a/iscsi-scst/kernel/config.c +++ b/iscsi-scst/kernel/config.c @@ -1095,7 +1095,7 @@ out: return res; } -static long ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static long iscsi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { long err; @@ -1172,7 +1172,7 @@ out: return err; } -static int open(struct inode *inode, struct file *file) +static int iscsi_open(struct inode *inode, struct file *file) { bool already; @@ -1190,7 +1190,7 @@ static int open(struct inode *inode, struct file *file) return 0; } -static int release(struct inode *inode, struct file *filp) +static int iscsi_release(struct inode *inode, struct file *filp) { #ifndef CONFIG_SCST_PROC struct iscsi_attr *attr, *t; @@ -1222,10 +1222,10 @@ static int release(struct inode *inode, struct file *filp) const struct file_operations ctr_fops = { .owner = THIS_MODULE, - .unlocked_ioctl = ioctl, - .compat_ioctl = ioctl, - .open = open, - .release = release, + .unlocked_ioctl = iscsi_ioctl, + .compat_ioctl = iscsi_ioctl, + .open = iscsi_open, + .release = iscsi_release, }; #ifdef CONFIG_SCST_DEBUG