diff --git a/[refs] b/[refs] index e635ef3e682a..fdf99e962c56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02bc35672b2fdf251e264adca5407792f63191e4 +refs/heads/master: 4f4038328da5eb9cc237b51d3fe68138fd3fea14 diff --git a/trunk/fs/9p/vfs_super.c b/trunk/fs/9p/vfs_super.c index 38d695d66a0b..a9d7d08cfbe8 100644 --- a/trunk/fs/9p/vfs_super.c +++ b/trunk/fs/9p/vfs_super.c @@ -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; }