On Fri, Feb 4, 2011 at 4:33 PM, <andros@xxxxxxxxxx> wrote:
> From: Andy Adamson <andros@xxxxxxxxxx>
>
> Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
> ---
> fs/nfs/nfs4proc.c | 11 ++++++++---
> 1 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index 9c50be7..fb22cbf 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -1574,7 +1574,7 @@ static int _nfs4_proc_open(struct nfs4_opendata *data)
> return 0;
> }
>
> -int nfs4_recover_expired_lease(struct nfs_client *clp)
> +static int nfs4_client_recover_expired_lease(struct nfs_client *clp)
> {
> unsigned int loop;
> int ret;
> @@ -1593,6 +1593,11 @@ int nfs4_recover_expired_lease(struct nfs_client *clp)
> }
> EXPORT_SYMBOL(nfs4_recover_expired_lease);
>
> +static int nfs4_recover_expired_lease(struct nfs_server *server)
> +{
> + return nfs4_client_recover_expired_lease(server->nfs_client);
> +}
> +
Why are we doing this extra indirection?
Fred
> /*
> * OPEN_EXPIRED:
> * reclaim state on the server after a network partition.
> @@ -1680,7 +1685,7 @@ static int _nfs4_do_open(struct inode *dir, struct path *path, fmode_t fmode, in
> dprintk("nfs4_do_open: nfs4_get_state_owner failed!\n");
> goto out_err;
> }
> - status = nfs4_recover_expired_lease(server->nfs_client);
> + status = nfs4_recover_expired_lease(server);
> if (status != 0)
> goto err_put_state_owner;
> if (path->dentry->d_inode != NULL)
> @@ -5075,7 +5080,7 @@ int nfs4_init_session(struct nfs_server *server)
> session->fc_attrs.max_rqst_sz = wsize + nfs41_maxwrite_overhead;
> session->fc_attrs.max_resp_sz = rsize + nfs41_maxread_overhead;
>
> - ret = nfs4_recover_expired_lease(server->nfs_client);
> + ret = nfs4_recover_expired_lease(server);
> if (!ret)
> ret = nfs4_check_client_ready(clp);
> return ret;
> --
> 1.6.6
>
> --
> 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
>
--
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
