summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAbhishek Kulkarni <adkulkar@umail.iu.edu>2009-07-19 13:41:53 -0600
committerEric Van Hensbergen <ericvh@strongmad.austin.ibm.com>2009-08-17 16:27:57 -0500
commit4f4038328da5eb9cc237b51d3fe68138fd3fea14 (patch)
tree66b55f59880d3cd1740b3f81273485d9a68a1e73 /fs
parent02bc35672b2fdf251e264adca5407792f63191e4 (diff)
downloadlinux-4f4038328da5eb9cc237b51d3fe68138fd3fea14.tar.bz2
9p: Fix v9fs show_options
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/9p/vfs_super.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index 38d695d66a0b..a9d7d08cfbe8 100644
--- a/fs/9p/vfs_super.c
+++ b/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;
}