diff options
| author | Kevin Vigor <kvigor@fb.com> | 2017-02-16 09:09:39 -0800 |
|---|---|---|
| committer | Kevin Vigor <kvigor@fb.com> | 2017-02-16 09:09:39 -0800 |
| commit | 9a84ee0b1fe938077ee965f81a98ab5da1bdfdcb (patch) | |
| tree | b9f7f7d5a6d0a65b1e0e9431f0d47559351c7fb2 /xlators/nfs | |
| parent | 5823eec46ffba4255435464d6858d41117ce7059 (diff) | |
| parent | c0de166648ddfea03505e69bade06556a4f9ad65 (diff) | |
Merge remote-tracking branch 'origin/release-3.8' into merge-3.8
Diffstat (limited to 'xlators/nfs')
| -rw-r--r-- | xlators/nfs/server/src/mount3.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c index bff7e0669ff..57d1874c79a 100644 --- a/xlators/nfs/server/src/mount3.c +++ b/xlators/nfs/server/src/mount3.c @@ -2544,8 +2544,6 @@ __mnt3svc_umountall (struct mount3_state *ms) GF_FREE (me); } - dict_unref (ms->mountdict); - return 0; } @@ -3939,7 +3937,13 @@ mnt3svc_deinit (xlator_t *nfsx) mnt3_auth_params_deinit (mstate->auth_params); /* Unmount everything and clear mountdict */ - mnt3svc_umountall (mstate); + LOCK (&mstate->mountlock); + { + __mnt3svc_umountall (mstate); + dict_unref (mstate->mountdict); + } + UNLOCK (&mstate->mountlock); + } rpcsvc_program_t * |