1 files changed, 20 insertions, 4 deletions

diff --git a/net/9p/client.c b/net/9p/client.c
index e3e5bf4469ce..0aa79faa9850 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -29,6 +29,7 @@
 #include <linux/poll.h>
 #include <linux/idr.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/uaccess.h>
 #include <net/9p/9p.h>
@@ -71,9 +72,10 @@ inline int p9_is_proto_dotu(struct p9_client *clnt)
 EXPORT_SYMBOL(p9_is_proto_dotu);
 
 /* Interpret mount option for protocol version */
-static unsigned char get_protocol_version(const substring_t *name)
+static int get_protocol_version(const substring_t *name)
 {
-        unsigned char version = -EINVAL;
+        int version = -EINVAL;
+
         if (!strncmp("9p2000", name->from, name->to-name->from)) {
                 version = p9_proto_legacy;
                 P9_DPRINTK(P9_DEBUG_9P, "Protocol version: Legacy\n");
@@ -533,7 +535,12 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...)
 
         P9_DPRINTK(P9_DEBUG_MUX, "client %p op %d\n", c, type);
 
-        if (c->status != Connected)
+        /* we allow for any status other than disconnected */
+        if (c->status == Disconnected)
+                return ERR_PTR(-EIO);
+
+        /* if status is begin_disconnected we allow only clunk request */
+        if ((c->status == BeginDisconnect) && (type != P9_TCLUNK))
                 return ERR_PTR(-EIO);
 
         if (signal_pending(current)) {
@@ -799,8 +806,10 @@ void p9_client_destroy(struct p9_client *clnt)
 
         v9fs_put_trans(clnt->trans_mod);
 
-        list_for_each_entry_safe(fid, fidptr, &clnt->fidlist, flist)
+        list_for_each_entry_safe(fid, fidptr, &clnt->fidlist, flist) {
+                printk(KERN_INFO "Found fid %d not clunked\n", fid->fid);
                 p9_fid_destroy(fid);
+        }
 
         if (clnt->fidpool)
                 p9_idpool_destroy(clnt->fidpool);
@@ -818,6 +827,13 @@ void p9_client_disconnect(struct p9_client *clnt)
 }
 EXPORT_SYMBOL(p9_client_disconnect);
 
+void p9_client_begin_disconnect(struct p9_client *clnt)
+{
+        P9_DPRINTK(P9_DEBUG_9P, "clnt %p\n", clnt);
+        clnt->status = BeginDisconnect;
+}
+EXPORT_SYMBOL(p9_client_begin_disconnect);
+
 struct p9_fid *p9_client_attach(struct p9_client *clnt, struct p9_fid *afid,
         char *uname, u32 n_uname, char *aname)
 {