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

Merge r6082 from 3.0.x-iser branch

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6259 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2015-06-11 15:47:42 +00:00
parent 8aa1081442
commit 5b0edfd079
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,7 +367,6 @@ wait_for_connection:
conn_dev = list_first_entry(&dev->new_conn_list, struct isert_conn_dev,
conn_list_entry);
list_move(&conn_dev->conn_list_entry, &dev->curr_conn_list);
kref_get(&conn_dev->kref);
spin_unlock(&dev->conn_lock);
res = snprintf(k_buff, sizeof(k_buff), "/dev/"ISER_CONN_DEV_PREFIX"%d",
@@ -496,6 +495,14 @@ static int isert_open(struct inode *inode, struct file *filp)
dev = container_of(inode->i_cdev, struct isert_conn_dev, cdev);
spin_lock(&isert_listen_dev.conn_lock);
if (unlikely(dev->occupied == 0)) {
spin_unlock(&isert_listen_dev.conn_lock);
res = -ENODEV; /* already closed */
goto out;
}
spin_unlock(&isert_listen_dev.conn_lock);
if (unlikely(!atomic_dec_and_test(&dev->available))) {
atomic_inc(&dev->available);
res = -EBUSY; /* already open */
@@ -504,6 +511,7 @@ static int isert_open(struct inode *inode, struct file *filp)
spin_lock(&isert_listen_dev.conn_lock);
list_del_init(&dev->conn_list_entry);
kref_get(&dev->kref);
spin_unlock(&isert_listen_dev.conn_lock);
filp->private_data = dev; /* for other methods */