Re: [PATCH 1/2] nfs-utils: libnsm.a: do not close file if open failed

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 12/02/2015 06:16 AM, Vivek Trivedi wrote:
> If file open failed, no need to issue close system call in
> nsm_get_state and closeall.
> 
> Signed-off-by: Vivek Trivedi <t.vivek@xxxxxxxxxxx>
Committed... 

steved.

> ---
>  support/nfs/closeall.c |    3 ++-
>  support/nsm/file.c     |    3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/support/nfs/closeall.c b/support/nfs/closeall.c
> index 38fb162..a69bf35 100644
> --- a/support/nfs/closeall.c
> +++ b/support/nfs/closeall.c
> @@ -31,6 +31,7 @@ closeall(int min)
>  	} else {
>  		int fd = sysconf(_SC_OPEN_MAX);
>  		while (--fd >= min)
> -			(void) close(fd);
> +			if(fd >= 0)
> +				(void) close(fd);
>  	}
>  }
> diff --git a/support/nsm/file.c b/support/nsm/file.c
> index 4711c2c..7a8b504 100644
> --- a/support/nsm/file.c
> +++ b/support/nsm/file.c
> @@ -536,7 +536,8 @@ nsm_get_state(_Bool update)
>  		state++;
>  
>  update:
> -	(void)close(fd);
> +	if(fd >= 0)
> +		(void)close(fd);
>  
>  	if (update) {
>  		state += 2;
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Filesystem Development]     [Linux USB Development]     [Linux Media Development]     [Video for Linux]     [Linux NILFS]     [Linux Audio Users]     [Yosemite Info]     [Linux SCSI]

  Powered by Linux