diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c
index d6e075f98..44af077c1 100644
--- a/iscsi-scst/kernel/iscsi.c
+++ b/iscsi-scst/kernel/iscsi.c
@@ -1568,7 +1568,7 @@ static int cmnd_prepare_recv_pdu(struct iscsi_conn *conn,
 		EXTRACHECKS_BUG_ON(addr == NULL);
 		sg_len = sg[idx].offset + sg[idx].length - offset;
 
-		conn->read_iov[i].iov_base = (void __force __user *)addr + offset;
+		conn->read_iov[i].iov_base = addr + offset;
 
 		if (size <= sg_len) {
 			TRACE_DBG("idx=%d, i=%d, offset=%u, size=%d, addr=%p",
diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index c642ae945..0e5b72e11 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -5279,6 +5279,8 @@ static void scst_ws_process_tail(struct scst_write_same_priv *wsp)
 	unsigned left;
 	int i;
 
+	TRACE_ENTRY();
+
 	lockdep_assert_held(&wsp->ws_mutex);
 	EXTRACHECKS_BUG_ON(wsp->ws_cur_in_flight > 0);
 	EXTRACHECKS_BUG_ON(wsp->ws_left_to_send >= wsp->ws_max_each);
@@ -5306,6 +5308,9 @@ static void scst_ws_process_tail(struct scst_write_same_priv *wsp)
 		}
 		left -= len;
 	}
+
+	TRACE_EXIT();
+	return;
 }
 
 /* Must be called in a thread context and no locks */