diff options
author | Bart Van Assche <bart.vanassche@wdc.com> | 2017-10-31 14:03:14 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2017-11-04 18:15:50 -0400 |
commit | 919765e9680fe26acdcad782ee693f31dbde2def (patch) | |
tree | e37a2c7057a4b5ddff9e837675dba69073aee2fb | |
parent | 8d973ab5d4520f84e89aaa38e0a50bb2876b09eb (diff) |
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>
-rw-r--r-- | drivers/target/iscsi/iscsi_target_erl1.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c index fe9b7f1e44ac..659efafb43ec 100644 --- a/drivers/target/iscsi/iscsi_target_erl1.c +++ b/drivers/target/iscsi/iscsi_target_erl1.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include "iscsi_target_erl2.h" | 34 | #include "iscsi_target_erl2.h" |
35 | #include "iscsi_target.h" | 35 | #include "iscsi_target.h" |
36 | 36 | ||
37 | #define OFFLOAD_BUF_SIZE 32768 | 37 | #define OFFLOAD_BUF_SIZE 32768U |
38 | 38 | ||
39 | /* | 39 | /* |
40 | * Used to dump excess datain payload for certain error recovery | 40 | * Used to dump excess datain payload for certain error recovery |
@@ -56,7 +56,7 @@ int iscsit_dump_data_payload( | |||
56 | if (conn->sess->sess_ops->RDMAExtensions) | 56 | if (conn->sess->sess_ops->RDMAExtensions) |
57 | return 0; | 57 | return 0; |
58 | 58 | ||
59 | length = (buf_len > OFFLOAD_BUF_SIZE) ? OFFLOAD_BUF_SIZE : buf_len; | 59 | length = min(buf_len, OFFLOAD_BUF_SIZE); |
60 | 60 | ||
61 | buf = kzalloc(length, GFP_ATOMIC); | 61 | buf = kzalloc(length, GFP_ATOMIC); |
62 | if (!buf) { | 62 | if (!buf) { |
@@ -67,8 +67,7 @@ int iscsit_dump_data_payload( | |||
67 | memset(&iov, 0, sizeof(struct kvec)); | 67 | memset(&iov, 0, sizeof(struct kvec)); |
68 | 68 | ||
69 | while (offset < buf_len) { | 69 | while (offset < buf_len) { |
70 | size = ((offset + length) > buf_len) ? | 70 | size = min(buf_len - offset, length); |
71 | (buf_len - offset) : length; | ||
72 | 71 | ||
73 | iov.iov_len = size; | 72 | iov.iov_len = size; |
74 | iov.iov_base = buf; | 73 | iov.iov_base = buf; |