1 files changed, 35 insertions, 28 deletions

diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c
index 6399d624ff8..7da412d0a35 100644
--- a/xlators/nfs/server/src/nfs3.c
+++ b/xlators/nfs/server/src/nfs3.c
@@ -526,6 +526,38 @@ nfs3_solaris_zerolen_fh (struct nfs3_fh *fh, int fhlen)
  */
 typedef ssize_t (*nfs3_serializer) (struct iovec outmsg, void *args);
 
+static void
+__nfs3_call_state_wipe (nfs3_call_state_t *cs)
+{
+        if (!cs)
+                return;
+
+        if (cs->fd) {
+                gf_msg_trace (GF_NFS3, 0, "fd 0x%lx ref: %d",
+                        (long)cs->fd, cs->fd->refcount);
+                fd_unref (cs->fd);
+        }
+
+        GF_FREE (cs->resolventry);
+
+        GF_FREE (cs->pathname);
+
+        if (!list_empty (&cs->entries.list))
+                gf_dirent_free (&cs->entries);
+
+        nfs_loc_wipe (&cs->oploc);
+        nfs_loc_wipe (&cs->resolvedloc);
+        if (cs->iob)
+                iobuf_unref (cs->iob);
+        if (cs->iobref)
+                iobref_unref (cs->iobref);
+        if (cs->trans)
+                rpc_transport_unref (cs->trans);
+        memset (cs, 0, sizeof (*cs));
+        mem_put (cs);
+        /* Already refd by fd_lookup, so no need to ref again. */
+}
+
 nfs3_call_state_t *
 nfs3_call_state_init (struct nfs3_state *s, rpcsvc_request_t *req, xlator_t *v)
 {
@@ -533,7 +565,7 @@ nfs3_call_state_init (struct nfs3_state *s, rpcsvc_request_t *req, xlator_t *v)
 
         GF_VALIDATE_OR_GOTO (GF_NFS3, s, err);
         GF_VALIDATE_OR_GOTO (GF_NFS3, req, err);
-        GF_VALIDATE_OR_GOTO (GF_NFS3, v, err);
+        /* GF_VALIDATE_OR_GOTO (GF_NFS3, v, err); NLM sets this later */
 
         cs = (nfs3_call_state_t *) mem_get (s->localpool);
         if (!cs) {
@@ -543,6 +575,7 @@ nfs3_call_state_init (struct nfs3_state *s, rpcsvc_request_t *req, xlator_t *v)
         }
 
         memset (cs, 0, sizeof (*cs));
+        GF_REF_INIT (cs, __nfs3_call_state_wipe);
         INIT_LIST_HEAD (&cs->entries.list);
         INIT_LIST_HEAD (&cs->openwait_q);
         cs->operrno = EINVAL;
@@ -557,33 +590,7 @@ err:
 void
 nfs3_call_state_wipe (nfs3_call_state_t *cs)
 {
-        if (!cs)
-                return;
-
-        if (cs->fd) {
-                gf_msg_trace (GF_NFS3, 0, "fd 0x%lx ref: %d",
-                        (long)cs->fd, cs->fd->refcount);
-                fd_unref (cs->fd);
-        }
-
-        GF_FREE (cs->resolventry);
-
-        GF_FREE (cs->pathname);
-
-        if (!list_empty (&cs->entries.list))
-                gf_dirent_free (&cs->entries);
-
-        nfs_loc_wipe (&cs->oploc);
-        nfs_loc_wipe (&cs->resolvedloc);
-        if (cs->iob)
-                iobuf_unref (cs->iob);
-        if (cs->iobref)
-                iobref_unref (cs->iobref);
-        if (cs->trans)
-                rpc_transport_unref (cs->trans);
-        memset (cs, 0, sizeof (*cs));
-        mem_put (cs);
-        /* Already refd by fd_lookup, so no need to ref again. */
+        GF_REF_PUT (cs);
 }