3 files changed, 53 insertions, 25 deletions

diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 9f035ccb6191..34a779edd421 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -411,31 +411,20 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root)
 {
         struct ceph_fs_client *fsc = ceph_sb_to_client(root->d_sb);
         struct ceph_mount_options *fsopt = fsc->mount_options;
-        struct ceph_options *opt = fsc->client->options;
-
-        if (opt->flags & CEPH_OPT_FSID)
-                seq_printf(m, ",fsid=%pU", &opt->fsid);
-        if (opt->flags & CEPH_OPT_NOSHARE)
-                seq_puts(m, ",noshare");
-        if (opt->flags & CEPH_OPT_NOCRC)
-                seq_puts(m, ",nocrc");
-        if (opt->flags & CEPH_OPT_NOMSGAUTH)
-                seq_puts(m, ",nocephx_require_signatures");
-        if ((opt->flags & CEPH_OPT_TCP_NODELAY) == 0)
-                seq_puts(m, ",notcp_nodelay");
-
-        if (opt->name)
-                seq_printf(m, ",name=%s", opt->name);
-        if (opt->key)
-                seq_puts(m, ",secret=<hidden>");
-
-        if (opt->mount_timeout != CEPH_MOUNT_TIMEOUT_DEFAULT)
-                seq_printf(m, ",mount_timeout=%d", opt->mount_timeout);
-        if (opt->osd_idle_ttl != CEPH_OSD_IDLE_TTL_DEFAULT)
-                seq_printf(m, ",osd_idle_ttl=%d", opt->osd_idle_ttl);
-        if (opt->osd_keepalive_timeout != CEPH_OSD_KEEPALIVE_DEFAULT)
-                seq_printf(m, ",osdkeepalivetimeout=%d",
-                           opt->osd_keepalive_timeout);
+        size_t pos;
+        int ret;
+
+        /* a comma between MNT/MS and client options */
+        seq_putc(m, ',');
+        pos = m->count;
+
+        ret = ceph_print_client_options(m, fsc->client);
+        if (ret)
+                return ret;
+
+        /* retract our comma if no client options */
+        if (m->count == pos)
+                m->count--;
 
         if (fsopt->flags & CEPH_MOUNT_OPT_DIRSTAT)
                 seq_puts(m, ",dirstat");
@@ -482,6 +471,7 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root)
                 seq_printf(m, ",readdir_max_bytes=%d", fsopt->max_readdir_bytes);
         if (strcmp(fsopt->snapdir_name, CEPH_SNAPDIRNAME_DEFAULT))
                 seq_printf(m, ",snapdirname=%s", fsopt->snapdir_name);
+
         return 0;
 }
 
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
index 16fff9608848..303be6ef7f94 100644
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
@@ -191,6 +191,7 @@ extern struct ceph_options *ceph_parse_options(char *options,
                               const char *dev_name, const char *dev_name_end,
                               int (*parse_extra_token)(char *c, void *private),
                               void *private);
+int ceph_print_client_options(struct seq_file *m, struct ceph_client *client);
 extern void ceph_destroy_options(struct ceph_options *opt);
 extern int ceph_compare_options(struct ceph_options *new_opt,
                                 struct ceph_client *client);
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index ec565508e904..79e8f71aef5b 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -490,6 +490,43 @@ out:
 }
 EXPORT_SYMBOL(ceph_parse_options);
 
+int ceph_print_client_options(struct seq_file *m, struct ceph_client *client)
+{
+        struct ceph_options *opt = client->options;
+        size_t pos = m->count;
+
+        if (opt->name)
+                seq_printf(m, "name=%s,", opt->name);
+        if (opt->key)
+                seq_puts(m, "secret=<hidden>,");
+
+        if (opt->flags & CEPH_OPT_FSID)
+                seq_printf(m, "fsid=%pU,", &opt->fsid);
+        if (opt->flags & CEPH_OPT_NOSHARE)
+                seq_puts(m, "noshare,");
+        if (opt->flags & CEPH_OPT_NOCRC)
+                seq_puts(m, "nocrc,");
+        if (opt->flags & CEPH_OPT_NOMSGAUTH)
+                seq_puts(m, "nocephx_require_signatures,");
+        if ((opt->flags & CEPH_OPT_TCP_NODELAY) == 0)
+                seq_puts(m, "notcp_nodelay,");
+
+        if (opt->mount_timeout != CEPH_MOUNT_TIMEOUT_DEFAULT)
+                seq_printf(m, "mount_timeout=%d,", opt->mount_timeout);
+        if (opt->osd_idle_ttl != CEPH_OSD_IDLE_TTL_DEFAULT)
+                seq_printf(m, "osd_idle_ttl=%d,", opt->osd_idle_ttl);
+        if (opt->osd_keepalive_timeout != CEPH_OSD_KEEPALIVE_DEFAULT)
+                seq_printf(m, "osdkeepalivetimeout=%d,",
+                           opt->osd_keepalive_timeout);
+
+        /* drop redundant comma */
+        if (m->count != pos)
+                m->count--;
+
+        return 0;
+}
+EXPORT_SYMBOL(ceph_print_client_options);
+
 u64 ceph_client_id(struct ceph_client *client)
 {
         return client->monc.auth->global_id;