aboutsummaryrefslogtreecommitdiffstats
path: root/fs/9p
diff options
context:
space:
mode:
authorEric Van Hensbergen <ericvh@ericvh-desktop.austin.ibm.com>2007-07-13 14:05:21 -0400
committerEric Van Hensbergen <ericvh@ericvh-desktop.austin.ibm.com>2007-07-14 16:14:14 -0400
commit9e2f6688c0b52882496aff576b009bc1f7eea0b8 (patch)
tree78192b3dec61c112ff89c60e81111cd98bf4ab68 /fs/9p
parent9523a841b109765f8779236d28be6458ee3a6824 (diff)
9p: re-enable mount time debug option
During reorganization, the mount time debug option was removed in favor of module-load-time parameters. However, the mount time option is still a useful for feature during debug and for user-fault isolation when the module is compiled into the kernel. Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Diffstat (limited to 'fs/9p')
-rw-r--r--fs/9p/v9fs.c7
-rw-r--r--fs/9p/vfs_super.c2
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 @@
43 43
44enum { 44enum {
45 /* Options that take integer arguments */ 45 /* Options that take integer arguments */
46 Opt_port, Opt_msize, Opt_uid, Opt_gid, Opt_afid, 46 Opt_debug, Opt_port, Opt_msize, Opt_uid, Opt_gid, Opt_afid,
47 Opt_rfdno, Opt_wfdno, 47 Opt_rfdno, Opt_wfdno,
48 /* String options */ 48 /* String options */
49 Opt_uname, Opt_remotename, 49 Opt_uname, Opt_remotename,
@@ -56,6 +56,7 @@ enum {
56}; 56};
57 57
58static match_table_t tokens = { 58static match_table_t tokens = {
59 {Opt_debug, "debug=%x"},
59 {Opt_port, "port=%u"}, 60 {Opt_port, "port=%u"},
60 {Opt_msize, "msize=%u"}, 61 {Opt_msize, "msize=%u"},
61 {Opt_uid, "uid=%u"}, 62 {Opt_uid, "uid=%u"},
@@ -128,6 +129,10 @@ static void v9fs_parse_options(char *options, struct v9fs_session_info *v9ses)
128 } 129 }
129 } 130 }
130 switch (token) { 131 switch (token) {
132 case Opt_debug:
133 v9ses->debug = option;
134 p9_debug_level = option;
135 break;
131 case Opt_port: 136 case Opt_port:
132 v9ses->port = option; 137 v9ses->port = option;
133 break; 138 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)
217 struct v9fs_session_info *v9ses = mnt->mnt_sb->s_fs_info; 217 struct v9fs_session_info *v9ses = mnt->mnt_sb->s_fs_info;
218 218
219 if (v9ses->debug != 0) 219 if (v9ses->debug != 0)
220 seq_printf(m, ",debug=%u", v9ses->debug); 220 seq_printf(m, ",debug=%x", v9ses->debug);
221 if (v9ses->port != V9FS_PORT) 221 if (v9ses->port != V9FS_PORT)
222 seq_printf(m, ",port=%u", v9ses->port); 222 seq_printf(m, ",port=%u", v9ses->port);
223 if (v9ses->maxdata != 9000) 223 if (v9ses->maxdata != 9000)