diff options
| -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; |
