d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant dev->si_drv1 NULL checks in the LinuxKPI.

Browse Source 
This pointer is checked during the linux_dev_open() callback and does
not need to be NULL checked again. It should always be set for
character devices belonging to the "linuxcdevsw" and technically
there is no need to NULL check this pointer at all.

Suggested by:	kib @
MFC after:	1 week
Sponsored by:	Mellanox Technologies
This commit is contained in:
hselasky 2017-11-03 13:43:05 +00:00
parent 2c853dd67e
commit 0d7b41d32f
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/compat/linuxkpi/common/src/linux_compat.c
View File

@ -745,8 +745,6 @@ linux_dev_close(struct cdev *dev, int fflag, int devtype, struct thread *td)
int error;
file = td->td_fpop;
if (dev->si_drv1 == NULL)
return (0);
if ((error = devfs_get_cdevpriv((void **)&filp)) != 0)
return (error);
filp->f_flags = file->f_flag;
@ -879,8 +877,6 @@ linux_dev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag,
int error;
file = td->td_fpop;
if (dev->si_drv1 == NULL)
return (ENXIO);
if ((error = devfs_get_cdevpriv((void **)&filp)) != 0)
return (error);
filp->f_flags = file->f_flag;
@ -948,8 +944,6 @@ linux_dev_read(struct cdev *dev, struct uio *uio, int ioflag)
td = curthread;
file = td->td_fpop;
if (dev->si_drv1 == NULL)
return (ENXIO);
if ((error = devfs_get_cdevpriv((void **)&filp)) != 0)
return (error);
filp->f_flags = file->f_flag;
@ -990,8 +984,6 @@ linux_dev_write(struct cdev *dev, struct uio *uio, int ioflag)
td = curthread;
file = td->td_fpop;
if (dev->si_drv1 == NULL)
return (ENXIO);
if ((error = devfs_get_cdevpriv((void **)&filp)) != 0)
return (error);
filp->f_flags = file->f_flag;
@ -1030,8 +1022,6 @@ linux_dev_poll(struct cdev *dev, int events, struct thread *td)
struct file *file;
int revents;
if (dev->si_drv1 == NULL)
goto error;
if (devfs_get_cdevpriv((void **)&filp) != 0)
goto error;
@ -1233,8 +1223,6 @@ linux_dev_kqfilter(struct cdev *dev, struct knote *kn)
td = curthread;
file = td->td_fpop;
if (dev->si_drv1 == NULL)
return (ENXIO);
if ((error = devfs_get_cdevpriv((void **)&filp)) != 0)
return (error);
filp->f_flags = file->f_flag;
@ -1285,8 +1273,6 @@ linux_dev_mmap_single(struct cdev *dev, vm_ooffset_t *offset,
td = curthread;
file = td->td_fpop;
if (dev->si_drv1 == NULL)
return (ENODEV);
if ((error = devfs_get_cdevpriv((void **)&filp)) != 0)
return (error);
filp->f_flags = file->f_flag;