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

This patch addresses a minor stylistic issue: use the value

Browse Source 
returned by mutex_lock_interruptible() instead of explicitly
assigning -EINTR to res.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4481 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2012-08-27 20:42:58 +00:00
parent 6df6692708
commit eb4f05aafe
4 changed files with 26 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
iscsi-scst/kernel/session.c
View File

@@ -552,10 +552,9 @@ static ssize_t iscsi_sess_force_close_store(struct kobject *kobj,
scst_sess = container_of(kobj, struct scst_session, sess_kobj);
sess = (struct iscsi_session *)scst_sess_get_tgt_priv(scst_sess);
if (mutex_lock_interruptible(&sess->target->target_mutex) != 0) {
res = -EINTR;
res = mutex_lock_interruptible(&sess->target->target_mutex);
if (res != 0)
goto out;
}
iscsi_sess_force_close(sess);

50
scst/src/dev_handlers/scst_vdisk.c
View File

@@ -4524,10 +4524,9 @@ static ssize_t vdisk_add_fileio_device(const char *device_name, char *params)
TRACE_ENTRY();
if (mutex_lock_interruptible(&scst_vdisk_mutex) != 0) {
res = -EINTR;
res = mutex_lock_interruptible(&scst_vdisk_mutex);
if (res != 0)
goto out;
}
res = vdev_fileio_add_device(device_name, params);
@@ -4544,10 +4543,9 @@ static ssize_t vdisk_add_blockio_device(const char *device_name, char *params)
TRACE_ENTRY();
if (mutex_lock_interruptible(&scst_vdisk_mutex) != 0) {
res = -EINTR;
res = mutex_lock_interruptible(&scst_vdisk_mutex);
if (res != 0)
goto out;
}
res = vdev_blockio_add_device(device_name, params);
@@ -4565,10 +4563,9 @@ static ssize_t vdisk_add_nullio_device(const char *device_name, char *params)
TRACE_ENTRY();
if (mutex_lock_interruptible(&scst_vdisk_mutex) != 0) {
res = -EINTR;
res = mutex_lock_interruptible(&scst_vdisk_mutex);
if (res)
goto out;
}
res = vdev_nullio_add_device(device_name, params);
@@ -4608,10 +4605,9 @@ static ssize_t vdisk_del_device(const char *device_name)
TRACE_ENTRY();
if (mutex_lock_interruptible(&scst_vdisk_mutex) != 0) {
res = -EINTR;
res = mutex_lock_interruptible(&scst_vdisk_mutex);
if (res != 0)
goto out;
}
virt_dev = vdev_find(device_name);
if (virt_dev == NULL) {
@@ -4693,10 +4689,9 @@ static ssize_t vcdrom_add_device(const char *device_name, char *params)
TRACE_ENTRY();
if (mutex_lock_interruptible(&scst_vdisk_mutex) != 0) {
res = -EINTR;
res = mutex_lock_interruptible(&scst_vdisk_mutex);
if (res != 0)
goto out;
}
res = __vcdrom_add_device(device_name, params);
@@ -4715,10 +4710,9 @@ static ssize_t vcdrom_del_device(const char *device_name)
TRACE_ENTRY();
if (mutex_lock_interruptible(&scst_vdisk_mutex) != 0) {
res = -EINTR;
res = mutex_lock_interruptible(&scst_vdisk_mutex);
if (res != 0)
goto out;
}
virt_dev = vdev_find(device_name);
if (virt_dev == NULL) {
@@ -5434,10 +5428,9 @@ static int vdisk_read_proc(struct seq_file *seq, struct scst_dev_type *dev_type)
TRACE_ENTRY();
if (mutex_lock_interruptible(&scst_vdisk_mutex) != 0) {
res = -EINTR;
res = mutex_lock_interruptible(&scst_vdisk_mutex);
if (res != 0)
goto out;
}
seq_printf(seq, "%-17s %-11s %-11s %-15s %-45s %-16s\n",
"Name", "Size(MB)", "Block size", "Options", "File name",
@@ -5525,10 +5518,9 @@ static int vdisk_write_proc(char *buffer, char **start, off_t offset,
goto out;
}
if (mutex_lock_interruptible(&scst_vdisk_mutex) != 0) {
res = -EINTR;
res = mutex_lock_interruptible(&scst_vdisk_mutex);
if (res != 0)
goto out_free;
}
p = i_buf;
if (p[strlen(p) - 1] == '\n')
@@ -5777,10 +5769,9 @@ static int vcdrom_read_proc(struct seq_file *seq,
TRACE_ENTRY();
if (mutex_lock_interruptible(&scst_vdisk_mutex) != 0) {
res = -EINTR;
res = mutex_lock_interruptible(&scst_vdisk_mutex);
if (res != 0)
goto out;
}
seq_printf(seq, "%-17s %-9s %s\n", "Name", "Size(MB)", "File name");
@@ -5931,10 +5922,9 @@ static int vcdrom_write_proc(char *buffer, char **start, off_t offset,
goto out;
}
if (mutex_lock_interruptible(&scst_vdisk_mutex) != 0) {
res = -EINTR;
res = mutex_lock_interruptible(&scst_vdisk_mutex);
if (res != 0)
goto out_free;
}
p = i_buf;
if (p[strlen(p) - 1] == '\n')

5
scst/src/scst_lib.c
View File

@@ -3251,10 +3251,9 @@ int gen_relative_target_port_id(uint16_t *id)
TRACE_ENTRY();
if (mutex_lock_interruptible(&scst_mutex) != 0) {
res = -EINTR;
res = mutex_lock_interruptible(&scst_mutex);
if (res != 0)
goto out;
}
rti_prev = rti;
do {

5
scst/src/scst_main.c
View File

@@ -743,10 +743,9 @@ int scst_suspend_activity(unsigned long timeout)
#endif
if (timeout != SCST_SUSPEND_TIMEOUT_UNLIMITED) {
if (mutex_lock_interruptible(&scst_suspend_mutex) != 0) {
res = -EINTR;
res = mutex_lock_interruptible(&scst_suspend_mutex);
if (res != 0)
goto out;
}
} else
mutex_lock(&scst_suspend_mutex);