Re: [PATCH 4/6] SUNPRC: cleanup RPC PipeFS pipes upcall interface

[Trond Myklebust]

On Tue, 2011-11-22 at 18:41 +0300, Stanislav Kinsbursky wrote: 
> RPC pipe upcall doesn't requires only private pipe data. Thus RPC inode
> references in this code can be removed.
> 
> Signed-off-by: Stanislav Kinsbursky <skinsbursky@xxxxxxxxxxxxx>
> 
> ---
>  fs/nfs/blocklayout/blocklayoutdev.c |    2 +-
>  fs/nfs/blocklayout/blocklayoutdm.c  |    2 +-
>  fs/nfs/idmap.c                      |    4 ++--
>  include/linux/sunrpc/rpc_pipe_fs.h  |    2 +-
>  net/sunrpc/auth_gss/auth_gss.c      |    3 +--
>  net/sunrpc/rpc_pipe.c               |    3 +--
>  6 files changed, 7 insertions(+), 9 deletions(-)
> 
> diff --git a/fs/nfs/blocklayout/blocklayoutdev.c b/fs/nfs/blocklayout/blocklayoutdev.c
> index a83b393..44dc348 100644
> --- a/fs/nfs/blocklayout/blocklayoutdev.c
> +++ b/fs/nfs/blocklayout/blocklayoutdev.c
> @@ -168,7 +168,7 @@ nfs4_blk_decode_device(struct nfs_server *server,
>  
>  	dprintk("%s CALLING USERSPACE DAEMON\n", __func__);
>  	add_wait_queue(&bl_wq, &wq);
> -	if (rpc_queue_upcall(bl_device_pipe->d_inode, &msg) < 0) {
> +	if (rpc_queue_upcall(RPC_I(bl_device_pipe->d_inode)->pipe, &msg) < 0) {

Needs a rebase: the above doesn't apply...

> 		remove_wait_queue(&bl_wq, &wq);
>  		goto out;
>  	}


-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@xxxxxxxxxx
www.netapp.com

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/