From 2c44492fae2fa61a7c4397a40715186f96ce56a3 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Thu, 21 Mar 2013 10:59:29 -0400 Subject: [PATCH] --- yaml --- r: 372183 b: refs/heads/master c: 8be2d2344cc192c20d7b2aa3211a5b74082e47d4 h: refs/heads/master i: 372181: ba228f9a6b4dedac094ef424ce8d6f0b15448541 372179: 492536ef671771743fc9cd8dc68366ccf9126a56 372175: ca6752499bdbd19b6229ab6c5b3e66cf86b2e82d v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4callback.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f0b826b3a3db..cf3202125865 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7823c797b4d29727499f0a75ddf3ed07af8ad0a +refs/heads/master: 8be2d2344cc192c20d7b2aa3211a5b74082e47d4 diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c index 99bc85ff0217..be3ff0f3ff68 100644 --- a/trunk/fs/nfsd/nfs4callback.c +++ b/trunk/fs/nfsd/nfs4callback.c @@ -817,8 +817,7 @@ static bool nfsd41_cb_get_slot(struct nfs4_client *clp, struct rpc_task *task) static void nfsd4_cb_prepare(struct rpc_task *task, void *calldata) { struct nfsd4_callback *cb = calldata; - struct nfs4_delegation *dp = container_of(cb, struct nfs4_delegation, dl_recall); - struct nfs4_client *clp = dp->dl_stid.sc_client; + struct nfs4_client *clp = cb->cb_clp; u32 minorversion = clp->cl_minorversion; cb->cb_minorversion = minorversion; @@ -839,8 +838,7 @@ static void nfsd4_cb_prepare(struct rpc_task *task, void *calldata) static void nfsd4_cb_done(struct rpc_task *task, void *calldata) { struct nfsd4_callback *cb = calldata; - struct nfs4_delegation *dp = container_of(cb, struct nfs4_delegation, dl_recall); - struct nfs4_client *clp = dp->dl_stid.sc_client; + struct nfs4_client *clp = cb->cb_clp; dprintk("%s: minorversion=%d\n", __func__, clp->cl_minorversion); @@ -863,7 +861,7 @@ static void nfsd4_cb_recall_done(struct rpc_task *task, void *calldata) { struct nfsd4_callback *cb = calldata; struct nfs4_delegation *dp = container_of(cb, struct nfs4_delegation, dl_recall); - struct nfs4_client *clp = dp->dl_stid.sc_client; + struct nfs4_client *clp = cb->cb_clp; struct rpc_clnt *current_rpc_client = clp->cl_cb_client; nfsd4_cb_done(task, calldata);