On Fri, 2013-08-09 at 12:49 -0400, Chuck Lever wrote:
> Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
> ---
> fs/nfs/nfs4state.c | 61 +++++++++++++++++++++++++++++-----------------------
> 1 file changed, 34 insertions(+), 27 deletions(-)
>
> diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
> index 8826df3..d816d93 100644
> --- a/fs/nfs/nfs4state.c
> +++ b/fs/nfs/nfs4state.c
> @@ -215,32 +215,6 @@ out:
> return cred;
> }
>
> -#if defined(CONFIG_NFS_V4_1)
> -
> -static int nfs41_setup_state_renewal(struct nfs_client *clp)
> -{
> - int status;
> - struct nfs_fsinfo fsinfo;
> -
> - if (!test_bit(NFS_CS_CHECK_LEASE_TIME, &clp->cl_res_state)) {
> - nfs4_schedule_state_renewal(clp);
> - return 0;
> - }
> -
> - status = nfs4_proc_get_lease_time(clp, &fsinfo);
> - if (status == 0) {
> - /* Update lease time and schedule renewal */
> - spin_lock(&clp->cl_lock);
> - clp->cl_lease_time = fsinfo.lease_time * HZ;
> - clp->cl_last_renewal = jiffies;
> - spin_unlock(&clp->cl_lock);
> -
> - nfs4_schedule_state_renewal(clp);
> - }
> -
> - return status;
> -}
> -
> static void nfs4_end_drain_slot_table(struct nfs4_slot_table *tbl)
> {
> if (test_and_clear_bit(NFS4_SLOT_TBL_DRAINING, &tbl->slot_tbl_state)) {
> @@ -254,6 +228,11 @@ static void nfs4_end_drain_session(struct nfs_client *clp)
> {
> struct nfs4_session *ses = clp->cl_session;
>
> + if (clp->cl_slot_tbl) {
> + nfs4_end_drain_slot_table(clp->cl_slot_tbl);
> + return;
> + }
> +
> if (ses != NULL) {
> nfs4_end_drain_slot_table(&ses->bc_slot_table);
> nfs4_end_drain_slot_table(&ses->fc_slot_table);
> @@ -278,6 +257,9 @@ static int nfs4_begin_drain_session(struct nfs_client *clp)
> struct nfs4_session *ses = clp->cl_session;
> int ret = 0;
>
> + if (clp->cl_slot_tbl)
> + return nfs4_drain_slot_tbl(clp->cl_slot_tbl);
> +
> /* back channel */
> ret = nfs4_drain_slot_tbl(&ses->bc_slot_table);
> if (ret)
> @@ -286,6 +268,32 @@ static int nfs4_begin_drain_session(struct nfs_client *clp)
> return nfs4_drain_slot_tbl(&ses->fc_slot_table);
> }
>
> +#if defined(CONFIG_NFS_V4_1)
> +
> +static int nfs41_setup_state_renewal(struct nfs_client *clp)
> +{
> + int status;
> + struct nfs_fsinfo fsinfo;
> +
> + if (!test_bit(NFS_CS_CHECK_LEASE_TIME, &clp->cl_res_state)) {
> + nfs4_schedule_state_renewal(clp);
> + return 0;
> + }
> +
> + status = nfs4_proc_get_lease_time(clp, &fsinfo);
> + if (status == 0) {
> + /* Update lease time and schedule renewal */
> + spin_lock(&clp->cl_lock);
> + clp->cl_lease_time = fsinfo.lease_time * HZ;
> + clp->cl_last_renewal = jiffies;
> + spin_unlock(&clp->cl_lock);
> +
> + nfs4_schedule_state_renewal(clp);
> + }
> +
> + return status;
> +}
> +
> static void nfs41_finish_session_reset(struct nfs_client *clp)
> {
> clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state);
> @@ -2083,7 +2091,6 @@ static int nfs4_bind_conn_to_session(struct nfs_client *clp)
> }
> #else /* CONFIG_NFS_V4_1 */
> static int nfs4_reset_session(struct nfs_client *clp) { return 0; }
> -static void nfs4_end_drain_session(struct nfs_client *clp) { }
>
> static int nfs4_bind_conn_to_session(struct nfs_client *clp)
> {
>
> --
> 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
When compiling without CONFIG_NFS_V4_1:
[trondmy@leira linux-nfs]$ make O=../object.x86_64 W=1 C=2 fs/nfs/nfs4state.o
make[2]: Nothing to be done for `all'.
make[2]: Nothing to be done for `relocs'.
Using /home/trondmy/devel/kernel/linux-nfs as source for kernel
GEN /home/trondmy/devel/kernel/object.x86_64/Makefile
CHK include/generated/uapi/linux/version.h
CHK include/generated/utsrelease.h
CALL /home/trondmy/devel/kernel/linux-nfs/scripts/checksyscalls.sh
CHECK /home/trondmy/devel/kernel/linux-nfs/scripts/mod/empty.c
CHECK /home/trondmy/devel/kernel/linux-nfs/fs/nfs/nfs4state.c
/home/trondmy/devel/kernel/linux-nfs/include/linux/err.h:34:16: warning: dereference of noderef expression
/home/trondmy/devel/kernel/linux-nfs/include/linux/err.h:34:16: warning: dereference of noderef expression
/home/trondmy/devel/kernel/linux-nfs/include/linux/err.h:29:23: warning: dereference of noderef expression
/home/trondmy/devel/kernel/linux-nfs/include/linux/err.h:34:16: warning: dereference of noderef expression
/home/trondmy/devel/kernel/linux-nfs/include/linux/err.h:29:23: warning: dereference of noderef expression
CC [M] fs/nfs/nfs4state.o
/home/trondmy/devel/kernel/linux-nfs/fs/nfs/nfs4state.c:255:12: warning: ‘nfs4_begin_drain_session’ defined but not used [-Wunused-function]
static int nfs4_begin_drain_session(struct nfs_client *clp)
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@xxxxxxxxxx
www.netapp.com
��.n��������+%������w��{.n�����{��w��� jg��� �����ݢj����G���� ���j:+v���w�m������w�������h�����٥
