Bart Van Assche
89347d7d6b
Merge r5872 from the iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6271 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:38:11 +00:00
Bart Van Assche
928c453a5c
Merge r5743 from the iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6270 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:37:21 +00:00
Bart Van Assche
6440794f3d
Merge r6000 from the iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6269 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:36:08 +00:00
Bart Van Assche
4710bfd984
Merge r5836 from the iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6268 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:35:18 +00:00
Bart Van Assche
0584116980
Merge r5797 from the iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6267 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:34:34 +00:00
Bart Van Assche
7a652a5e3b
Merge r5842 from the iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6266 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:33:49 +00:00
Bart Van Assche
010de6bd43
Merge r5860 from the iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6265 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:32:49 +00:00
Bart Van Assche
a9b0644c96
Merge r5865 from the iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6264 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:29:39 +00:00
Bart Van Assche
bd520b5e23
Merge r5839 from the iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6263 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:27:18 +00:00
Bart Van Assche
c728d4e3af
Merge r5870 from the iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6262 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:25:50 +00:00
Bart Van Assche
2bd336549a
Finish merging the 3.0.x-iser branch into the 3.0.x branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6261 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 16:00:22 +00:00
Bart Van Assche
994908e601
Merge r6083 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6260 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:47:59 +00:00
Bart Van Assche
5b0edfd079
Merge r6082 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6259 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:47:42 +00:00
Bart Van Assche
8aa1081442
Merge r6014 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6258 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:47:28 +00:00
Bart Van Assche
26891b58bd
Merge r6013 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6257 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:47:15 +00:00
Bart Van Assche
9ac2427ec5
Merge r6012 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6256 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:47:00 +00:00
Bart Van Assche
34ae1e829a
Merge r6011 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6255 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:46:44 +00:00
Bart Van Assche
ab31727bcd
Merge r6010 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6254 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:46:30 +00:00
Bart Van Assche
716ff53045
Merge r6009 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6253 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:46:15 +00:00
Bart Van Assche
a97d0be047
Merge r6008 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6252 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:46:00 +00:00
Bart Van Assche
7efd9d336b
Merge r6007 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6251 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:45:43 +00:00
Bart Van Assche
e52b7a8a89
Merge r6006 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6250 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:45:16 +00:00
Bart Van Assche
4a6806a2af
Merge r6005 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6249 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:44:57 +00:00
Bart Van Assche
ec67a69535
Merge r5902 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6248 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:44:32 +00:00
Bart Van Assche
69ea41df6d
Merge r5877 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6247 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:44:05 +00:00
Bart Van Assche
8ae0d17a39
Merge r5846 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6246 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:43:37 +00:00
Bart Van Assche
3bcf9d7a02
Merge r5843 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6245 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:43:12 +00:00
Bart Van Assche
8b5061f5f8
Merge r5792 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6244 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:42:55 +00:00
Bart Van Assche
6fe3cb0eba
Merge r5782 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6243 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:42:37 +00:00
Bart Van Assche
7cba4ba078
Merge r5742 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6242 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:42:06 +00:00
Bart Van Assche
a5e0e412c0
Finish merging r5663 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6241 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:40:55 +00:00
Bart Van Assche
1536ce4e3b
Merge r5742 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6240 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:33:22 +00:00
Bart Van Assche
faae8613ce
Merge r5663 from 3.0.x-iser branch
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6239 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-06-11 15:32:44 +00:00
Bart Van Assche
ef830f9335
ib_srpt: Avoid that aborting a command triggers a race condition (merge r6181 from trunk)
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6182 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-04-10 17:18:22 +00:00
Bart Van Assche
e9f22173e5
scripts: Merge r6132:6177 from trunk
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6178 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-04-02 14:51:00 +00:00
Vladislav Bolkhovitin
fc51102b1a
Boost version numbers
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6143 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-03-11 04:26:28 +00:00
Bart Van Assche
405d9b09fa
scripts/generate-release-archive: Include build_mode file in generated archives (merge r6132 from trunk)
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6133 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-24 14:37:10 +00:00
Bart Van Assche
90dead9c5c
iscsi-scst/usr/Makefile: Fix SCST include path (merge r6130 from trunk)
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6131 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-24 14:12:35 +00:00
Bart Van Assche
d9738e6388
Makefile: Add top-level release-archive target (merge r6127 from trunk)
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6129 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-24 13:37:57 +00:00
Bart Van Assche
5695df532c
scripts/update-version: Add (merge r6126 from trunk)
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6128 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-24 13:37:09 +00:00
Bart Van Assche
4f379de39d
Version: Update from 3.0.0 into 3.0.1
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6124 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-23 13:57:35 +00:00
Bart Van Assche
d2d0d232b2
/etc/init.d/scst: Exit with status code 0 upon start if already running (merge r5912 from trunk)
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6123 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-23 13:48:29 +00:00
Bart Van Assche
8330f4c911
Version: Update from 3.0.0 into 3.0.1
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6122 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-23 13:47:41 +00:00
Bart Van Assche
79d5b92465
Version: Update from 3.0.0 into 3.0.1
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6121 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-23 13:37:42 +00:00
Bart Van Assche
49303f5b9c
scst_lib: Logging fixes (merge r5558 from trunk)
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6120 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-23 13:37:30 +00:00
Bart Van Assche
d39335c5b2
Version: Update from 3.0.0 into 3.0.1
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6119 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-23 13:17:35 +00:00
Bart Van Assche
69bcadfffd
scst: Add scripts/rebuild-rhel-kernel-rpm to the SCST release archive (merge r5895 from trunk)
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6118 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-23 13:16:43 +00:00
Bart Van Assche
1c17224d12
Version: Update from 3.0.0 into 3.0.1
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6117 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-23 13:12:02 +00:00
Bart Van Assche
3964a367cd
nightly: Merge r5915:6114 from trunk
...
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6115 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-22 09:59:21 +00:00
Vladislav Bolkhovitin
5c963d25e1
Merged revisions 5984,5988-5989 via svnmerge from
...
svn+ssh://vlnb@svn.code.sf.net/p/scst/svn/trunk
........
r5984 | vlnb | 2015-01-21 21:03:17 -0800 (Wed, 21 Jan 2015) | 9 lines
[PATCH] scst_local: Fix bidirectional command support
scsi_setup_cmnd() sets sc_data_direction to DMA_TO_DEVICE for bidirectional
commands. Hence test SCpnt->request->next_rq instead of sc_data_direction
to figure out whether or not a command is bidirectional.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
........
r5988 | vlnb | 2015-01-21 21:13:59 -0800 (Wed, 21 Jan 2015) | 27 lines
scst_vdisk: Fix zero-copy read for tmpfs
For some filesystems, e.g. tmpfs, address_space.readpage is NULL.
Disable zero-copy reading for such filesystems. See also shmem_aops
in mm/shmem.c. See also inode_init_always() and empty_aops in fs/inode.c.
This patch avoids that the following call trace is triggered:
BUG: unable to handle kernel NULL pointer dereference at (null)
Call Trace:
[<ffffffffa0547d66>] prepare_read+0x106/0x1d0 [scst_vdisk]
[<ffffffffa0547f20>] fileio_alloc_data_buf+0xf0/0x330 [scst_vdisk]
[<ffffffffa046fc9b>] scst_prepare_space+0x9b/0x6e0 [scst]
[<ffffffffa047d4d5>] scst_process_active_cmd+0x545/0x840 [scst]
[<ffffffffa047dad2>] scst_cmd_init_done+0x302/0x5d0 [scst]
[<ffffffffa0563ab2>] scst_cmd_init_stage1_done.constprop.37+0x12/0x20 [iscsi_scst]
[<ffffffffa056a9ea>] scsi_cmnd_start+0x25a/0x550 [iscsi_scst]
[<ffffffffa056b4a8>] cmnd_rx_start+0x148/0x1a0 [iscsi_scst]
[<ffffffffa056e4f8>] process_read_io+0x3b8/0x800 [iscsi_scst]
[<ffffffffa056ea07>] scst_do_job_rd+0xc7/0x220 [iscsi_scst]
[<ffffffffa056efed>] istrd+0x16d/0x2e0 [iscsi_scst]
[<ffffffff81079efd>] kthread+0xed/0x110
[<ffffffff817227fc>] ret_from_fork+0x7c/0xb0
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
........
r5989 | vlnb | 2015-01-23 21:37:57 -0800 (Fri, 23 Jan 2015) | 5 lines
scst_local: Rework data direction detection code
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
........
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6112 d57e44dd-8a1f-0410-8b47-8ef2f437770f
2015-02-21 04:16:51 +00:00