When testing this patch, i found that i had forgotten an earlier patch, from a different source. Attached.
Julia Longtin
diff -ur iscsitarget/kernel/conn.c iscsitarget.patched/kernel/conn.c
--- iscsitarget/kernel/conn.c 2015-05-05 18:11:24.000000000 +0000
+++ iscsitarget.patched/kernel/conn.c 2015-05-05 18:01:40.000000000 +0000
@@ -127,7 +127,7 @@
dprintk(D_GENERIC, "%llu\n", (unsigned long long) session->sid);
- conn->sock = SOCKET_I(conn->file->f_dentry->d_inode);
+ conn->sock = SOCKET_I(conn->file->f_path.dentry->d_inode);
conn->sock->sk->sk_user_data = conn;
write_lock_bh(&conn->sock->sk->sk_callback_lock);
diff -ur iscsitarget/kernel/file-io.c iscsitarget.patched/kernel/file-io.c
--- iscsitarget/kernel/file-io.c 2015-05-05 18:11:24.000000000 +0000
+++ iscsitarget.patched/kernel/file-io.c 2015-05-05 18:03:10.000000000 +0000
@@ -69,7 +69,7 @@
static int fileio_sync(struct iet_volume *lu, struct tio *tio)
{
struct fileio_data *p = lu->private;
- struct inode *inode = p->filp->f_dentry->d_inode;
+ struct inode *inode = p->filp->f_path.dentry->d_inode;
struct address_space *mapping = inode->i_mapping;
loff_t ppos, count;
int res;
@@ -213,7 +213,7 @@
eprintk("%d\n", err);
goto out;
}
- inode = p->filp->f_dentry->d_inode;
+ inode = p->filp->f_path.dentry->d_inode;
if (S_ISREG(inode->i_mode))
;
diff -ur iscsitarget/kernel/iscsi.c iscsitarget.patched/kernel/iscsi.c
--- iscsitarget/kernel/iscsi.c 2015-05-05 18:11:24.000000000 +0000
+++ iscsitarget.patched/kernel/iscsi.c 2015-05-05 17:59:39.000000000 +0000
@@ -986,9 +986,6 @@
set_cmnd_lunit(req);
switch (req_hdr->scb[0]) {
- case SERVICE_ACTION_IN:
- if ((req_hdr->scb[1] & 0x1f) != 0x10)
- goto error;
case INQUIRY:
case REPORT_LUNS:
case TEST_UNIT_READY:
diff -ur iscsitarget/kernel/target_disk.c iscsitarget.patched/kernel/target_disk.c
--- iscsitarget/kernel/target_disk.c 2015-05-05 18:11:24.000000000 +0000
+++ iscsitarget.patched/kernel/target_disk.c 2015-05-05 18:04:09.000000000 +0000
@@ -606,9 +606,6 @@
case REQUEST_SENSE:
send_data_rsp(cmnd, build_request_sense_response);
break;
- case SERVICE_ACTION_IN:
- send_data_rsp(cmnd, build_service_action_in_response);
- break;
case READ_6:
case READ_10:
case READ_16:
diff -ur iscsitarget/kernel/volume.c iscsitarget.patched/kernel/volume.c
--- iscsitarget/kernel/volume.c 2015-05-05 18:11:24.000000000 +0000
+++ iscsitarget.patched/kernel/volume.c 2015-05-05 18:02:29.000000000 +0000
@@ -398,9 +398,6 @@
case READ_CAPACITY:
/* allowed commands when reserved */
break;
- case SERVICE_ACTION_IN:
- if ((scb[1] & 0x1F) == 0x10)
- break;
/* fall through */
default:
err = -EBUSY;
@@ -465,9 +462,6 @@
if (excl_access_ro && !registered)
err = -EBUSY;
break;
- case SERVICE_ACTION_IN:
- if ((scb[1] & 0x1F) == 0x10)
- break;
/* fall through */
case RELEASE:
case RESERVE:
signature.asc
Description: Digital signature
