mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-18 03:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

iscsi-scst: change local names of ioctl() and open() to not conflict

Browse Source 
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 <dab21774@gmail.com>

with some changes



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7138 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2017-04-21 00:57:10 +00:00
parent dd026f8511
commit a8336afa4c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
iscsi-scst/kernel/config.c
View File

@@ -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