[pnfs] [PATCH 17/20] 2.6-latest pnfs client layoutreturn

[Benny Halevy]

On Nov. 28, 2007, 23:33 +0200, andros at umich.edu wrote:
> From: Andy Adamson <andros at umich.edu>
> 
> Implement the layoutreturn operation.
> 
> Signed-off by: Andy Adamson<andros at umich.edu>
> ---
>  fs/nfs/inode.c     |    3 ++
>  fs/nfs/nfs4proc.c  |   18 +++++++++--
>  fs/nfs/nfs4state.c |   21 ++++++++++++-
>  fs/nfs/nfs4xdr.c   |   88 +++++++++++++++++++++++++++++++++++++++++++++++++++-
>  4 files changed, 125 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
> index b7beb0f..2eb53c5 100644
> --- a/fs/nfs/inode.c
> +++ b/fs/nfs/inode.c
> @@ -1140,6 +1140,9 @@ void nfs4_clear_inode(struct inode *inode)
>  	nfs_inode_return_delegation(inode);
>  	/* First call standard NFS clear_inode() code */
>  	nfs_clear_inode(inode);
> +#ifdef CONFIG_PNFS
> +	pnfs_return_layout(inode, NULL);
> +#endif /* CONFIG_PNFS */
>  }
>  #endif
>  
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index 7a17cbe..c710cc2 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -5016,8 +5016,20 @@ static int pnfs_proc_layoutcommit(struct pnfs_layoutcommit_data *data)
>  
>  static int nfs4_proc_pnfs_layoutreturn(struct nfs4_pnfs_layoutreturn* layout)

this function is renamed to pnfs4_proc_layoutreturn only in the next patch.
please move the rename here to make the patchset bisectable.

<snip>

> -	.pnfs_layoutreturn       = nfs4_proc_pnfs_layoutreturn,
> +	.pnfs_layoutreturn       = pnfs4_proc_layoutreturn,