2008-02-18 18:35:58

by Chuck Lever III

[permalink] [raw]
Subject: [PATCH 07/17] mount command: Fix type of get_socket's timeout argument

Clean up: The type of get_socket's timeout argument should match the type of
the ultimate destination of its value, the tv_sec field in a timeval struct.

Signed-off-by: Chuck Lever <[email protected]>

utils/mount/network.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/mount/network.c b/utils/mount/network.c
index c54b312..a893a4a 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -260,7 +260,7 @@ static int __nfs_gs_err_connect(const int socket, const struct sockaddr *saddr,
* On error return, caller closes the socket.
static int connect_to(int fd, struct sockaddr *addr,
- socklen_t addrlen, int timeout)
+ socklen_t addrlen, time_t timeout)
int ret, saved;
fd_set rset, wset;
@@ -308,7 +308,7 @@ out:
* The caller should check rpc_createerr to determine the cause of any error.
static int get_socket(struct sockaddr_in *saddr, unsigned int p_prot,
- unsigned int timeout, int resvp, int conn)
+ time_t timeout, int resvp, int conn)
int so, type;
struct sockaddr_in laddr;