diff --git a/[refs] b/[refs]
index 3487c2363853..48384e8ef706 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d40fa2492eb3dcf02468eef2f6bba450be42b22
+refs/heads/master: 8e44a0805fc9d77475060280136aa491aa7d7060
diff --git a/trunk/net/9p/client.c b/trunk/net/9p/client.c
index c155cc45eff9..e50ec802937a 100644
--- a/trunk/net/9p/client.c
+++ b/trunk/net/9p/client.c
@@ -1168,6 +1168,12 @@ int p9_client_clunk(struct p9_fid *fid)
 	struct p9_client *clnt;
 	struct p9_req_t *req;
 
+	if (!fid) {
+		P9_EPRINTK(KERN_WARNING, "Trying to clunk with NULL fid\n");
+		dump_stack();
+		return 0;
+	}
+
 	P9_DPRINTK(P9_DEBUG_9P, ">>> TCLUNK fid %d\n", fid->fid);
 	err = 0;
 	clnt = fid->clnt;