]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
9p: Fix v9fs show_options
authorAbhishek Kulkarni <adkulkar@umail.iu.edu>
Sun, 19 Jul 2009 19:41:53 +0000 (13:41 -0600)
committerEric Van Hensbergen <ericvh@strongmad.austin.ibm.com>
Mon, 17 Aug 2009 21:27:57 +0000 (16:27 -0500)
Add the delimiter ',' before the options when they are passed
and check if no option parameters are passed to prevent displaying
NULL in /proc/mounts.

Signed-off-by: Abhishek Kulkarni <adkulkar@umail.iu.edu>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
fs/9p/vfs_super.c

index 38d695d66a0b7899ff8c76ef21cfca4679722fa5..a9d7d08cfbe8ad7d579e287683f3871ca3023c0b 100644 (file)
@@ -220,8 +220,8 @@ static void v9fs_kill_super(struct super_block *s)
 static int v9fs_show_options(struct seq_file *m, struct vfsmount *mnt)
 {
        struct v9fs_session_info *v9ses = mnt->mnt_sb->s_fs_info;
-
-       seq_printf(m, "%s", v9ses->options);
+       if (v9ses->options != NULL)
+               seq_printf(m, ",%s", v9ses->options);
        return 0;
 }