ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/pipe: Simplify some null checks

Browse Source 
Several null checks are not actually necessary.

Change-Id: I6827e3d4147ed0b9fb22b2148656cba87be5e18c
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17507
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
Ben Walker 2023-04-05 13:20:15 -07:00 committed by David Ko
parent 5e29ec96e3
commit cc2c42e849
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/util/pipe.c
View File

@ -73,7 +73,7 @@ spdk_pipe_writer_get_buffer(struct spdk_pipe *pipe, uint32_t requested_sz, struc
} else { } else {
sz = spdk_min(requested_sz, read - write); sz = spdk_min(requested_sz, read - write);
iovs[0].iov_base = (sz == 0) ? NULL : (pipe->buf + write); iovs[0].iov_base = pipe->buf + write;
iovs[0].iov_len = sz; iovs[0].iov_len = sz;
iovs[1].iov_base = NULL; iovs[1].iov_base = NULL;
iovs[1].iov_len = 0; iovs[1].iov_len = 0;
@ -156,7 +156,7 @@ spdk_pipe_reader_get_buffer(struct spdk_pipe *pipe, uint32_t requested_sz, struc
read = pipe->read; read = pipe->read;
write = pipe->write; write = pipe->write;
if (read == write && !pipe->full) { if ((read == write && !pipe->full) || requested_sz == 0) {
iovs[0].iov_base = NULL; iovs[0].iov_base = NULL;
iovs[0].iov_len = 0; iovs[0].iov_len = 0;
iovs[1].iov_base = NULL; iovs[1].iov_base = NULL;
@ -164,14 +164,14 @@ spdk_pipe_reader_get_buffer(struct spdk_pipe *pipe, uint32_t requested_sz, struc
} else if (read < write) { } else if (read < write) {
sz = spdk_min(requested_sz, write - read); sz = spdk_min(requested_sz, write - read);
iovs[0].iov_base = (sz == 0) ? NULL : (pipe->buf + read); iovs[0].iov_base = pipe->buf + read;
iovs[0].iov_len = sz; iovs[0].iov_len = sz;
iovs[1].iov_base = NULL; iovs[1].iov_base = NULL;
iovs[1].iov_len = 0; iovs[1].iov_len = 0;
} else { } else {
sz = spdk_min(requested_sz, pipe->sz - read); sz = spdk_min(requested_sz, pipe->sz - read);
iovs[0].iov_base = (sz == 0) ? NULL : (pipe->buf + read); iovs[0].iov_base = pipe->buf + read;
iovs[0].iov_len = sz; iovs[0].iov_len = sz;
requested_sz -= sz; requested_sz -= sz;