Merge branch 'zero_copy_write-3' into resolve-conflicts

Conflicts:
	lib/iscsi-command.c
	lib/pdu.c
	lib/socket.c

lib/login.c

@@ -706,10 +706,10 @@ iscsi_login_async(struct iscsi_context *iscsi, iscsi_command_cb cb,
 		return -1;
 	}
 
-	pdu = iscsi_allocate_pdu_with_itt_flags_size(iscsi,
+	pdu = iscsi_allocate_pdu_with_itt_flags(iscsi,
 				ISCSI_PDU_LOGIN_REQUEST,
 				ISCSI_PDU_LOGIN_RESPONSE,
-				iscsi->itt, 0, 1024);
+				iscsi->itt, 0);
 	if (pdu == NULL) {
 		iscsi_set_error(iscsi, "Out-of-memory: Failed to allocate "
 				"login pdu.");