Skip to content

Commit

Permalink
9p: Fix missing commas in mount options
Browse files Browse the repository at this point in the history
Since commit c4fac91 ("9p: Implement show_options"), the mount
options of 9p filesystems are printed out with some missing commas
between the individual options:

p9-scratch on /mnt/scratch type 9p (rw,dirsync,loose,access=clienttrans=virtio)

Add them back.

Cc: [email protected] # 4.13+
Fixes: c4fac91 ("9p: Implement show_options")
Signed-off-by: Tuomas Tynkkynen <[email protected]>
Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
dezgeg authored and Al Viro committed Nov 19, 2017
1 parent 9523fea commit 61b272c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion net/9p/client.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ int p9_show_client_options(struct seq_file *m, struct p9_client *clnt)
{
if (clnt->msize != 8192)
seq_printf(m, ",msize=%u", clnt->msize);
seq_printf(m, "trans=%s", clnt->trans_mod->name);
seq_printf(m, ",trans=%s", clnt->trans_mod->name);

switch (clnt->proto_version) {
case p9_proto_legacy:
Expand Down
6 changes: 3 additions & 3 deletions net/9p/trans_fd.c
Original file line number Diff line number Diff line change
Expand Up @@ -724,12 +724,12 @@ static int p9_fd_show_options(struct seq_file *m, struct p9_client *clnt)
{
if (clnt->trans_mod == &p9_tcp_trans) {
if (clnt->trans_opts.tcp.port != P9_PORT)
seq_printf(m, "port=%u", clnt->trans_opts.tcp.port);
seq_printf(m, ",port=%u", clnt->trans_opts.tcp.port);
} else if (clnt->trans_mod == &p9_fd_trans) {
if (clnt->trans_opts.fd.rfd != ~0)
seq_printf(m, "rfd=%u", clnt->trans_opts.fd.rfd);
seq_printf(m, ",rfd=%u", clnt->trans_opts.fd.rfd);
if (clnt->trans_opts.fd.wfd != ~0)
seq_printf(m, "wfd=%u", clnt->trans_opts.fd.wfd);
seq_printf(m, ",wfd=%u", clnt->trans_opts.fd.wfd);
}
return 0;
}
Expand Down

0 comments on commit 61b272c

Please sign in to comment.