Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: remove sysctl
  9p: fix bad kconfig cross-dependency
  9p: soften invalidation in loose_mode
  9p: attach-per-user
  9p: rename uid and gid parameters
  9p: define session flags
  9p: Make transports dynamic

1 files changed, 1 insertions, 18 deletions

diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index ba904371218b..bb0cef9a6b8a 100644
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -216,24 +216,7 @@ static int v9fs_show_options(struct seq_file *m, struct vfsmount *mnt)
 {
         struct v9fs_session_info *v9ses = mnt->mnt_sb->s_fs_info;
 
-        if (v9ses->debug != 0)
-                seq_printf(m, ",debug=%x", v9ses->debug);
-        if (v9ses->port != V9FS_PORT)
-                seq_printf(m, ",port=%u", v9ses->port);
-        if (v9ses->maxdata != 9000)
-                seq_printf(m, ",msize=%u", v9ses->maxdata);
-        if (v9ses->afid != ~0)
-                seq_printf(m, ",afid=%u", v9ses->afid);
-        if (v9ses->proto == PROTO_UNIX)
-                seq_puts(m, ",proto=unix");
-        if (v9ses->extended == 0)
-                seq_puts(m, ",noextend");
-        if (v9ses->nodev == 1)
-                seq_puts(m, ",nodevmap");
-        seq_printf(m, ",name=%s", v9ses->name);
-        seq_printf(m, ",aname=%s", v9ses->remotename);
-        seq_printf(m, ",uid=%u", v9ses->uid);
-        seq_printf(m, ",gid=%u", v9ses->gid);
+        seq_printf(m, "%s", v9ses->options);
         return 0;
 }