mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-19 13:46:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

isert: Make the login character device more posix compliant

Browse Source 
This fixes a case where iscsi-scstd will go into busy-waiting loop
on some occasions because it would not detect disconnect correctly

Signed-off-by: Yan Burman <yanb@mellanox.com>

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/iser@5999 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Yan Burman
2015-01-28 12:15:35 +00:00
parent c9e71e4d7c
commit ba2083708a
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iscsi-scst/kernel/isert-scst/isert_login.c
+9 -7
View File
@@ -555,6 +555,9 @@ static ssize_t isert_read(struct file *filp, char __user *buf, size_t count,
struct isert_conn_dev *dev = filp->private_data;
size_t to_read;
if (dev->state == CS_DISCONNECTED)
return -EPIPE;
if (will_read_block(dev)) {
int ret;
if (filp->f_flags & O_NONBLOCK)
@@ -565,9 +568,6 @@ static ssize_t isert_read(struct file *filp, char __user *buf, size_t count,
return ret;
}
if (dev->state == CS_DISCONNECTED)
return -EPIPE;
to_read = min(count, dev->read_len);
if (copy_to_user(buf, dev->read_buf, to_read))
return -EFAULT;
@@ -769,11 +769,13 @@ static unsigned int isert_poll(struct file *filp,
poll_wait(filp, &dev->waitqueue, wait);
if (!dev->conn)
mask |= POLLHUP | POLLERR;
if (!will_read_block(dev))
mask |= POLLIN | POLLRDNORM;
mask |= POLLHUP | POLLIN;
else {
if (!will_read_block(dev))
mask |= POLLIN | POLLRDNORM;
mask |= POLLOUT | POLLWRNORM;
mask |= POLLOUT | POLLWRNORM;
}
return mask;
}