Merge tag '9p-for-5.1' of git://github.com/martinetd/linux

Pull 9p updates from Dominique Martinet:
 "Here is a 9p update for 5.1; there honestly hasn't been much.

  Two fixes (leak on invalid mount argument and possible deadlock on
  i_size update on 32bit smp) and a fall-through warning cleanup"

* tag '9p-for-5.1' of git://github.com/martinetd/linux:
  9p/net: fix memory leak in p9_client_create
  9p: use inode->i_lock to protect i_size_write() under 32-bit
  9p: mark expected switch fall-through

2 files changed, 2 insertions, 2 deletions

diff --git a/net/9p/client.c b/net/9p/client.c
index 357214a51f13..b85d51f4b8eb 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -1061,7 +1061,7 @@ struct p9_client *p9_client_create(const char *dev_name, char *options)
                 p9_debug(P9_DEBUG_ERROR,
                          "Please specify a msize of at least 4k\n");
                 err = -EINVAL;
-                goto free_client;
+                goto close_trans;
         }
 
         err = p9_client_version(clnt);
diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c
index e2fbf3677b9b..29420ebb8f07 100644
--- a/net/9p/trans_xen.c
+++ b/net/9p/trans_xen.c
@@ -513,7 +513,7 @@ static void xen_9pfs_front_changed(struct xenbus_device *dev,
         case XenbusStateClosed:
                 if (dev->state == XenbusStateClosed)
                         break;
-                /* Missed the backend's CLOSING state -- fallthrough */
+                /* fall through - Missed the backend's CLOSING state */
         case XenbusStateClosing:
                 xenbus_frontend_closed(dev);
                 break;