Commit bb75b28f authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

nbd: Refactor the function in which the fix of scan build error is added 



Consolidating multiptle reinsertions into a place will make the logic
a little cleaner.

Change-Id: Iab7e9f8e7dcdebbec9d51e151b1d838567c1dcc4
Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/427441


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent e1e9b05e

lib/nbd/nbd.c

+4 −5
Original line number Diff line number Diff line
@@ -661,8 +661,7 @@ spdk_nbd_io_xmit_internal(struct spdk_nbd_disk *nbd) 
		ret = write_to_socket(nbd->spdk_sp_fd, (char *)&io->resp + io->offset,

				      sizeof(io->resp) - io->offset);

		if (ret <= 0) {

			TAILQ_INSERT_HEAD(&nbd->executed_io_list, io, tailq);

			return ret;

			goto reinsert;

		}



		io->offset += ret;
@@ -684,8 +683,7 @@ spdk_nbd_io_xmit_internal(struct spdk_nbd_disk *nbd) 
	if (io->state == NBD_IO_XMIT_PAYLOAD) {

		ret = write_to_socket(nbd->spdk_sp_fd, io->payload + io->offset, io->payload_size - io->offset);

		if (ret <= 0) {

			TAILQ_INSERT_HEAD(&nbd->executed_io_list, io, tailq);

			return ret;

			goto reinsert;

		}



		io->offset += ret;
@@ -697,8 +695,9 @@ spdk_nbd_io_xmit_internal(struct spdk_nbd_disk *nbd) 
		}

	}



reinsert:

	TAILQ_INSERT_HEAD(&nbd->executed_io_list, io, tailq);

	return 0;

	return ret;

}



static int