Commit 06668d50 authored by Jacek Kalwas's avatar Jacek Kalwas Committed by Tomasz Zawadzki
Browse files

sock/posix: fix posix_sock_set_recvbuf return value 



While doing that aligned rc checking style and adjust spdk_sock_set*
return description.

Change-Id: I86d9aceceb38254284723023f93a0e4e29d5c50f
Signed-off-by: default avatarJacek Kalwas <jacek.kalwas@nutanix.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26044


Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
parent f5db59b7

include/spdk/sock.h

+3 −3
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ int spdk_sock_recv_next(struct spdk_sock *sock, void **buf, void **ctx); 
 * \param sock Socket to set for.

 * \param nbytes Value for recvlowat.

 *

 * \return 0 on success, -1 on failure.

 * \return 0 on success, -1 on failure with errno set.

 */

int spdk_sock_set_recvlowat(struct spdk_sock *sock, int nbytes);
@@ -508,7 +508,7 @@ int spdk_sock_set_recvlowat(struct spdk_sock *sock, int nbytes); 
 * \param sock Socket to set buffer size for.

 * \param sz Buffer size in bytes.

 *

 * \return 0 on success, -1 on failure.

 * \return 0 on success, -1 on failure with errno set.

 */

int spdk_sock_set_recvbuf(struct spdk_sock *sock, int sz);
@@ -518,7 +518,7 @@ int spdk_sock_set_recvbuf(struct spdk_sock *sock, int sz); 
 * \param sock Socket to set buffer size for.

 * \param sz Buffer size in bytes.

 *

 * \return 0 on success, -1 on failure.

 * \return 0 on success, -1 on failure with errno set.

 */

int spdk_sock_set_sendbuf(struct spdk_sock *sock, int sz);

module/sock/posix/posix.c

+5 −11
Original line number Diff line number Diff line
@@ -364,7 +364,8 @@ posix_sock_set_recvbuf(struct spdk_sock *_sock, int sz) 
	if (_sock->impl_opts.enable_recv_pipe) {

		rc = posix_sock_alloc_pipe(sock, sz);

		if (rc) {

			return rc;

			errno = rc;

			return -1;

		}

	}
@@ -377,12 +378,11 @@ posix_sock_set_recvbuf(struct spdk_sock *_sock, int sz) 
	}



	rc = setsockopt(sock->fd, SOL_SOCKET, SO_RCVBUF, &sz, sizeof(sz));

	if (rc < 0) {

	if (rc) {

		return rc;

	}



	_sock->impl_opts.recv_buf_size = sz;



	return 0;

}
@@ -404,12 +404,11 @@ posix_sock_set_sendbuf(struct spdk_sock *_sock, int sz) 
	}



	rc = setsockopt(sock->fd, SOL_SOCKET, SO_SNDBUF, &sz, sizeof(sz));

	if (rc < 0) {

	if (rc) {

		return rc;

	}



	_sock->impl_opts.send_buf_size = sz;



	return 0;

}
@@ -1583,16 +1582,11 @@ posix_sock_set_recvlowat(struct spdk_sock *_sock, int nbytes) 
{

	struct spdk_posix_sock *sock = __posix_sock(_sock);

	int val;

	int rc;



	assert(sock != NULL);



	val = nbytes;

	rc = setsockopt(sock->fd, SOL_SOCKET, SO_RCVLOWAT, &val, sizeof val);

	if (rc != 0) {

		return -1;

	}

	return 0;

	return setsockopt(sock->fd, SOL_SOCKET, SO_RCVLOWAT, &val, sizeof val);

}



static bool