We need to pass the svc_serv* to the xprt when nfs_callback_info.users > 0
Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx>
---
fs/nfs/callback.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 8d7c142..4bf60b2 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -31,6 +31,7 @@
struct nfs_callback_data {
unsigned int users;
+ struct svc_serv *serv;
struct svc_rqst *rqst;
struct task_struct *task;
};
@@ -262,6 +263,7 @@ int nfs_callback_up(u32 minorversion, void *args)
svc_sock_update_bufs(serv);
sprintf(svc_name, "nfsv4.%u-svc", minorversion);
+ nfs_callback_info.serv = serv;
nfs_callback_info.rqst = rqstp;
nfs_callback_info.task = kthread_run(callback_svc,
nfs_callback_info.rqst,
@@ -269,6 +271,7 @@ int nfs_callback_up(u32 minorversion, void *args)
if (IS_ERR(nfs_callback_info.task)) {
ret = PTR_ERR(nfs_callback_info.task);
svc_exit_thread(nfs_callback_info.rqst);
+ nfs_callback_info.serv = NULL;
nfs_callback_info.rqst = NULL;
nfs_callback_info.task = NULL;
goto out_err;
@@ -301,6 +304,7 @@ void nfs_callback_down(void)
if (nfs_callback_info.users == 0 && nfs_callback_info.task != NULL) {
kthread_stop(nfs_callback_info.task);
svc_exit_thread(nfs_callback_info.rqst);
+ nfs_callback_info.serv = NULL;
nfs_callback_info.rqst = NULL;
nfs_callback_info.task = NULL;
}
--
1.6.2.1
--
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
