mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-14 09:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

isert-scst: Fix sparse warnings related to poll functions

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7837 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2018-11-28 06:39:48 +00:00
parent ebcc4891d2
commit bf3f677040
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
iscsi-scst/kernel/isert-scst/isert_login.c
View File

@@ -286,16 +286,16 @@ out:
return res;
}
static unsigned int isert_listen_poll(struct file *filp,
struct poll_table_struct *wait)
static __poll_t isert_listen_poll(struct file *filp,
struct poll_table_struct *wait)
{
struct isert_listener_dev *dev = filp->private_data;
unsigned int mask = 0;
__poll_t mask = 0;
poll_wait(filp, &dev->waitqueue, wait);
if (have_new_connection(dev))
mask |= POLLIN | POLLRDNORM;
mask |= EPOLLIN | EPOLLRDNORM;
return mask;
}
@@ -832,21 +832,20 @@ out:
return res;
}
static unsigned int isert_poll(struct file *filp,
struct poll_table_struct *wait)
static __poll_t isert_poll(struct file *filp, struct poll_table_struct *wait)
{
struct isert_conn_dev *dev = filp->private_data;
unsigned int mask = 0;
__poll_t mask = 0;
poll_wait(filp, &dev->waitqueue, wait);
if (!dev->conn || dev->state == CS_DISCONNECTED)
mask |= POLLHUP | POLLIN;
else {
if (!dev->conn || dev->state == CS_DISCONNECTED) {
mask |= EPOLLHUP | EPOLLIN;
} else {
if (!will_read_block(dev))
mask |= POLLIN | POLLRDNORM;
mask |= EPOLLIN | EPOLLRDNORM;
mask |= POLLOUT | POLLWRNORM;
mask |= EPOLLOUT | EPOLLWRNORM;
}
return mask;