hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/iscsi: Use min() in iscsit_dump_data_payload() instead of open-coding it 

This patch does not change any functionality.

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Mike Christie <mchristi@redhat.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Bart Van Assche 2017-10-31 11:03:14 -07:00 committed by Nicholas Bellinger
parent 8d973ab5d4
commit 919765e968
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/target/iscsi/iscsi_target_erl1.c
View File

@ -34,7 +34,7 @@
#include "iscsi_target_erl2.h" #include "iscsi_target_erl2.h"
#include "iscsi_target.h" #include "iscsi_target.h"
#define OFFLOAD_BUF_SIZE 32768 #define OFFLOAD_BUF_SIZE 32768U
/* /*
* Used to dump excess datain payload for certain error recovery * Used to dump excess datain payload for certain error recovery
@ -56,7 +56,7 @@ int iscsit_dump_data_payload(
if (conn->sess->sess_ops->RDMAExtensions) if (conn->sess->sess_ops->RDMAExtensions)
return 0; return 0;
length = (buf_len > OFFLOAD_BUF_SIZE) ? OFFLOAD_BUF_SIZE : buf_len; length = min(buf_len, OFFLOAD_BUF_SIZE);
buf = kzalloc(length, GFP_ATOMIC); buf = kzalloc(length, GFP_ATOMIC);
if (!buf) { if (!buf) {
@ -67,8 +67,7 @@ int iscsit_dump_data_payload(
memset(&iov, 0, sizeof(struct kvec)); memset(&iov, 0, sizeof(struct kvec));
while (offset < buf_len) { while (offset < buf_len) {
size = ((offset + length) > buf_len) ? size = min(buf_len - offset, length);
(buf_len - offset) : length;
iov.iov_len = size; iov.iov_len = size;
iov.iov_base = buf; iov.iov_base = buf;