src/client.c

[David Teigland]

 src/client.c |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

New commits:
commit abb38ac9d20a1776b50c1711dc8a2897028e950f
Author: David Teigland <teigland(a)redhat.com&gt;
Date:   Wed Apr 1 15:12:29 2015 -0500

    sanlock: close fd in sanlock_version

diff --git a/src/client.c b/src/client.c
index 5349046..85f1f3a 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1008,25 +1008,30 @@ int sanlock_version(uint32_t flags, uint32_t *version, uint32_t
*proto)
 
 	rv = send_header(fd, SM_CMD_VERSION, flags, 0, 0, 0);
 	if (rv < 0)
-		return rv;
+		goto out;
 
 	memset(&h, 0, sizeof(h));
 
 	rv = recv(fd, &h, sizeof(h), MSG_WAITALL);
-	if (rv < 0)
-		return -errno;
+	if (rv < 0) {
+		rv = -errno;
+		goto out;
+	}
 	if (rv != sizeof(h))
-		return -1;
+		goto out;
 
 	if (proto)
 		*proto = h.version;
 
 	rv = (int)h.data;
 	if (rv < 0)
-		return rv;
+		goto out;
 
 	*version = h.data2;
-	return 0;
+	rv = 0;
+ out:
+	close(fd);
+	return rv;
 }
 
 int sanlock_killpath(int sock, uint32_t flags, const char *path, char *args)

[Nir Soffer]

----- Original Message -----
>  From: "David Teigland" <teigland(a)fedoraproject.org&gt;
>  To: sanlock-devel(a)lists.fedorahosted.org
>  Sent: Wednesday, April 1, 2015 11:20:05 PM
>  Subject: src/client.c
>  
>  src/client.c |   17 +++++++++++------
>   1 file changed, 11 insertions(+), 6 deletions(-)
>  
>  New commits:
>  commit abb38ac9d20a1776b50c1711dc8a2897028e950f
>  Author: David Teigland <teigland(a)redhat.com&gt;
>  Date:   Wed Apr 1 15:12:29 2015 -0500
>  
>      sanlock: close fd in sanlock_version
>  
>  diff --git a/src/client.c b/src/client.c
>  index 5349046..85f1f3a 100644
>  --- a/src/client.c
>  +++ b/src/client.c
>  @@ -1008,25 +1008,30 @@ int sanlock_version(uint32_t flags, uint32_t
>  *version, uint32_t *proto)
>   
>   	rv = send_header(fd, SM_CMD_VERSION, flags, 0, 0, 0);
>   	if (rv < 0)
>  -		return rv;
>  +		goto out;
>   
>   	memset(&h, 0, sizeof(h));
>   
>   	rv = recv(fd, &h, sizeof(h), MSG_WAITALL);
>  -	if (rv < 0)
>  -		return -errno;
>  +	if (rv < 0) {
>  +		rv = -errno;
>  +		goto out;
>  +	}
>   	if (rv != sizeof(h))
>  -		return -1;
>  +		goto out; 
This used to return -1, will return now positive value

>   
>   	if (proto)
>   		*proto = h.version;
>   
>   	rv = (int)h.data;
>   	if (rv < 0)
>  -		return rv;
>  +		goto out;
>   
>   	*version = h.data2;
>  -	return 0;
>  +	rv = 0;
>  + out:
>  +	close(fd);
>  +	return rv;
>   }
>   
>   int sanlock_killpath(int sock, uint32_t flags, const char *path, char *args)
>  
>  
>  _______________________________________________
>  sanlock-devel mailing list
>  sanlock-devel(a)lists.fedorahosted.org
>  https://lists.fedorahosted.org/mailman/listinfo/sanlock-devel
>