4 files changed, 10 insertions, 11 deletions

diff --git a/fs/9p/Makefile b/fs/9p/Makefile
index 12d52421d58b..87897f84dfb6 100644
--- a/fs/9p/Makefile
+++ b/fs/9p/Makefile
@@ -1,9 +1,9 @@
-obj-$(CONFIG_9P_FS) := 9p2000.o
+obj-$(CONFIG_9P_FS) := 9p.o
 
-9p2000-objs := \
+9p-objs := \
         trans_fd.o \
         mux.o \
-        9p.o \
+        fcall.o \
         conv.o \
         vfs_super.o \
         vfs_inode.o \
diff --git a/fs/9p/9p.c b/fs/9p/fcall.c
index 552de120bbd5..71742ba150c4 100644
--- a/fs/9p/9p.c
+++ b/fs/9p/fcall.c
@@ -1,5 +1,5 @@
 /*
- *  linux/fs/9p/9p.c
+ *  linux/fs/9p/fcall.c
  *
  *  This file contains functions to perform synchronous 9P calls
  *
@@ -154,7 +154,6 @@ v9fs_t_clunk(struct v9fs_session_info *v9ses, u32 fid)
  * @tag: tag to release
  *
  */
-
 int v9fs_t_flush(struct v9fs_session_info *v9ses, u16 oldtag)
 {
         int ret;
@@ -171,7 +170,7 @@ int v9fs_t_flush(struct v9fs_session_info *v9ses, u16 oldtag)
 
         return ret;
 }
-#endif  /*  0  */
+#endif
 
 /**
  * v9fs_t_stat - read a file's meta-data
diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index b633433f9ced..d37416eb5791 100644
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -50,7 +50,7 @@ enum {
         Opt_port, Opt_msize, Opt_uid, Opt_gid, Opt_afid, Opt_debug,
         Opt_rfdno, Opt_wfdno,
         /* String options */
-        Opt_name, Opt_remotename,
+        Opt_uname, Opt_remotename,
         /* Options that take no arguments */
         Opt_legacy, Opt_nodevmap, Opt_unix, Opt_tcp, Opt_fd,
         /* Error token */
@@ -66,7 +66,7 @@ static match_table_t tokens = {
         {Opt_rfdno, "rfdno=%u"},
         {Opt_wfdno, "wfdno=%u"},
         {Opt_debug, "debug=%x"},
-        {Opt_name, "name=%s"},
+        {Opt_uname, "uname=%s"},
         {Opt_remotename, "aname=%s"},
         {Opt_unix, "proto=unix"},
         {Opt_tcp, "proto=tcp"},
@@ -115,7 +115,7 @@ static void v9fs_parse_options(char *options, struct v9fs_session_info *v9ses)
                 if (!*p)
                         continue;
                 token = match_token(p, tokens, args);
-                if (token < Opt_name) {
+                if (token < Opt_uname) {
                         if ((ret = match_int(&args[0], &option)) < 0) {
                                 dprintk(DEBUG_ERROR,
                                         "integer field, but no integer?\n");
@@ -157,7 +157,7 @@ static void v9fs_parse_options(char *options, struct v9fs_session_info *v9ses)
                 case Opt_fd:
                         v9ses->proto = PROTO_FD;
                         break;
-                case Opt_name:
+                case Opt_uname:
                         match_strcpy(v9ses->name, &args[0]);
                         break;
                 case Opt_remotename:
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index 083ed5af8a1e..b0a0ae509c00 100644
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -261,7 +261,7 @@ static struct super_operations v9fs_super_ops = {
 };
 
 struct file_system_type v9fs_fs_type = {
-        .name = "9P",
+        .name = "9p",
         .get_sb = v9fs_get_sb,
         .kill_sb = v9fs_kill_super,
         .owner = THIS_MODULE,