diff --git a/net/9p/client.c b/net/9p/client.c
index bb2b8a3af19623d9fa9ace2bb8477fed5991672a..cb170750337c02047ea0b1ff41dc36a028f105dc 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -127,12 +127,12 @@ void p9_client_destroy(struct p9_client *clnt)
 		clnt->trans = NULL;
 	}
 
-	if (clnt->fidpool)
-		p9_idpool_destroy(clnt->fidpool);
-
 	list_for_each_entry_safe(fid, fidptr, &clnt->fidlist, flist)
 		p9_fid_destroy(fid);
 
+	if (clnt->fidpool)
+		p9_idpool_destroy(clnt->fidpool);
+
 	kfree(clnt);
 }
 EXPORT_SYMBOL(p9_client_destroy);