Re: atimes not updated over NFS

["J. Bruce Fields" <bfields@fieldses.org>]

On Tue, Jan 29, 2008 at 08:51:55PM +0100, Jens Axboe wrote:
> On Tue, Jan 29 2008, J. Bruce Fields wrote:
> > Hm.  It's still missing a case.  I've confirmed that the following fixes
> > the problem.  (Or maybe it would be better to have them "goto" a common
> > out with the file_accessed() check?)
> 
> Indeed it is, insert standard disclaimer here on the evil of multiple
> returns. So can we agree that this then fixes both cases?

Yep, thanks!  And I ran one more test just to make sure.  Looks fine.

--b.
> 
> diff --git a/fs/splice.c b/fs/splice.c
> index 0a0b79b..1577a73 100644
> --- a/fs/splice.c
> +++ b/fs/splice.c
> @@ -1031,7 +1031,11 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
>  			goto out_release;
>  	}
>  
> +done:
>  	pipe->nrbufs = pipe->curbuf = 0;
> +	if (bytes > 0)
> +		file_accessed(in);
> +
>  	return bytes;
>  
>  out_release:
> @@ -1047,16 +1051,11 @@ out_release:
>  			buf->ops = NULL;
>  		}
>  	}
> -	pipe->nrbufs = pipe->curbuf = 0;
> -
> -	/*
> -	 * If we transferred some data, return the number of bytes:
> -	 */
> -	if (bytes > 0)
> -		return bytes;
>  
> -	return ret;
> +	if (!bytes)
> +		bytes = ret;
>  
> +	goto done;
>  }
>  EXPORT_SYMBOL(splice_direct_to_actor);
>  
> 
> -- 
> Jens Axboe
>