2 files changed, 7 insertions, 2 deletions

diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index 4feb5ae63ecf..45c35986d49f 100644
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -43,7 +43,7 @@
 
 enum {
         /* Options that take integer arguments */
-        Opt_port, Opt_msize, Opt_uid, Opt_gid, Opt_afid,
+        Opt_debug, Opt_port, Opt_msize, Opt_uid, Opt_gid, Opt_afid,
         Opt_rfdno, Opt_wfdno,
         /* String options */
         Opt_uname, Opt_remotename,
@@ -56,6 +56,7 @@ enum {
 };
 
 static match_table_t tokens = {
+        {Opt_debug, "debug=%x"},
         {Opt_port, "port=%u"},
         {Opt_msize, "msize=%u"},
         {Opt_uid, "uid=%u"},
@@ -128,6 +129,10 @@ static void v9fs_parse_options(char *options, struct v9fs_session_info *v9ses)
                         }
                 }
                 switch (token) {
+                case Opt_debug:
+                        v9ses->debug = option;
+                        p9_debug_level = option;
+                        break;
                 case Opt_port:
                         v9ses->port = option;
                         break;
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index f6a0519ade8c..ba904371218b 100644
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -217,7 +217,7 @@ static int v9fs_show_options(struct seq_file *m, struct vfsmount *mnt)
         struct v9fs_session_info *v9ses = mnt->mnt_sb->s_fs_info;
 
         if (v9ses->debug != 0)
-                seq_printf(m, ",debug=%u", v9ses->debug);
+                seq_printf(m, ",debug=%x", v9ses->debug);
         if (v9ses->port != V9FS_PORT)
                 seq_printf(m, ",port=%u", v9ses->port);
         if (v9ses->maxdata != 9000)