mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-20 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-03-17 19:13:39 -07:00
parent e9f53e75c2 3b76bc5b1f
commit 17328b22e0
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iscsi-scst/kernel/conn.c
+1 -1
View File
@@ -787,7 +787,7 @@ static int conn_setup_sock(struct iscsi_conn *conn)
conn->sock->sk->sk_user_data = conn;
oldfs = get_fs();
set_fs(get_ds());
set_fs(KERNEL_DS);
conn->sock->ops->setsockopt(conn->sock, SOL_TCP, TCP_NODELAY,
(void __force __user *)&opt, sizeof(opt));
set_fs(oldfs);
iscsi-scst/kernel/iscsi.c
+1 -1
View File
@@ -2899,7 +2899,7 @@ static inline void set_cork(struct socket *sock, int on)
mm_segment_t oldfs;
oldfs = get_fs();
set_fs(get_ds());
set_fs(KERNEL_DS);
sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK,
(void __force __user *)&opt, sizeof(opt));
set_fs(oldfs);
iscsi-scst/kernel/nthread.c
+3 -2
View File
@@ -565,7 +565,7 @@ restart:
#endif
oldfs = get_fs();
set_fs(get_ds());
set_fs(KERNEL_DS);
res = sock_recvmsg(conn->sock, msg,
#if SOCK_RECVMSG_HAS_FOUR_ARGS
read_size,
@@ -1189,7 +1189,8 @@ retry:
sock = conn->sock;
if ((write_cmnd->parent_req->scst_cmd != NULL) &&
if (write_cmnd->parent_req->scst_cmd &&
write_cmnd->parent_req->scst_state != ISCSI_CMD_STATE_AEN &&
scst_cmd_get_dh_data_buff_alloced(write_cmnd->parent_req->scst_cmd))
sock_sendpage = sock_no_sendpage;
else
scst/src/dev_handlers/scst_vdisk.c
+6 -6
View File
@@ -1720,7 +1720,7 @@ static int vdisk_format_dif(struct scst_cmd *cmd, uint64_t start_lba,
iv[i].iov_base = (uint8_t __force __user *)data_buf;
old_fs = get_fs();
set_fs(get_ds());
set_fs(KERNEL_DS);
loff = start_lba << SCST_DIF_TAG_SHIFT;
left = blocks << SCST_DIF_TAG_SHIFT;
@@ -3003,7 +3003,7 @@ static ssize_t fileio_read_sync(struct file *fd, void *buf, size_t len,
ssize_t ret;
old_fs = get_fs();
set_fs(get_ds());
set_fs(KERNEL_DS);
ret = scst_read(fd, buf, len, loff);
set_fs(old_fs);
@@ -5394,7 +5394,7 @@ static int vdev_read_dif_tags(struct vdisk_cmd_params *p)
max_iv_count = p->sync.iv_count;
old_fs = get_fs();
set_fs(get_ds());
set_fs(KERNEL_DS);
tags_sg = NULL;
loff = (p->loff >> cmd->dev->block_shift) << SCST_DIF_TAG_SHIFT;
@@ -5515,7 +5515,7 @@ static int vdev_write_dif_tags(struct vdisk_cmd_params *p)
max_iv_count = p->sync.iv_count;
old_fs = get_fs();
set_fs(get_ds());
set_fs(KERNEL_DS);
tags_sg = NULL;
loff = (p->loff >> cmd->dev->block_shift) << SCST_DIF_TAG_SHIFT;
@@ -5701,7 +5701,7 @@ static enum compl_status_e fileio_exec_write(struct vdisk_cmd_params *p)
}
old_fs = get_fs();
set_fs(get_ds());
set_fs(KERNEL_DS);
while (1) {
iv_count = 0;
@@ -6415,7 +6415,7 @@ static enum compl_status_e fileio_exec_read(struct vdisk_cmd_params *p)
}
old_fs = get_fs();
set_fs(get_ds());
set_fs(KERNEL_DS);
while (1) {
iv_count = 0;
scst/src/scst_lib.c
+1 -1
View File
@@ -5928,7 +5928,7 @@ static void scst_complete_request_sense(struct scst_cmd *req_cmd)
static int scst_cmp_fs_ds(void)
{
mm_segment_t fs = get_fs();
mm_segment_t ds = get_ds();
mm_segment_t ds = KERNEL_DS;
return memcmp(&fs, &ds, sizeof(fs));
}