Patch "9p: Fix missing commas in mount options" has been added to the 4.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
9p: Fix missing commas in mount options
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
9p-fix-missing-commas-in-mount-options.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
61b272c3aa170b3e461b8df636407b29f35f98ebMon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <[email protected]>
Date: Sun, 19 Nov 2017 11:28:43 +0200
Subject: 9p: Fix missing commas in mount options
From: Tuomas Tynkkynen <[email protected]>
commit 61b272c3aa170b3e461b8df636407b29f35f98eb upstream.
Since commit c4fac9100456 ("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.
--- net/9p/client.c | 2 +- net/9p/trans_fd.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
net/9p/client.c +1 -1
@@ -82,7 +82,7 @@ int p9_show_client_options(struct seq_fi {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:
net/9p/trans_fd.c +3 -3
@@ -724,12 +724,12 @@ static int p9_fd_show_options(struct seq {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 ; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/net-9p-switch-to-wait_event_killable.patch queue-4.14/9p-fix-missing-commas-in-mount-options.patch queue-4.14/fs-9p-compare-qid.path-in-v9fs_test_inode.patch