ceph: show more mount options if the value is different with default

Commit Message

Chengguang Xu May 31, 2018, 3:56 a.m. UTC

fixes included in this patch:
- add showing mount option 'norequire_active_mds'
- add showing mount option 'ino32'
- only show wsize if the value is different with default

Signed-off-by: Chengguang Xu <[e-mail]>
---
 fs/ceph/super.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Patch

diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index b33082e6878f..8e3f69b6a78b 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -541,6 +541,10 @@  static int ceph_show_options(struct seq_file *m, struct dentry *root)
 		seq_puts(m, ",nopoolperm");
 	if (fsopt->flags & CEPH_MOUNT_OPT_NOQUOTADF)
 		seq_puts(m, ",noquotadf");
+	if (fsopt->flags & CEPH_MOUNT_OPT_MOUNTWAIT)
+		seq_puts(m, ",norequire_active_mds");
+	if (fsopt->flags & CEPH_MOUNT_OPT_INO32)
+		seq_puts(m, ",ino32");
 
 #ifdef CONFIG_CEPH_FS_POSIX_ACL
 	if (fsopt->sb_flags & SB_POSIXACL)
@@ -551,7 +555,7 @@  static int ceph_show_options(struct seq_file *m, struct dentry *root)
 
 	if (fsopt->mds_namespace)
 		seq_show_option(m, "mds_namespace", fsopt->mds_namespace);
-	if (fsopt->wsize)
+	if (fsopt->wsize != CEPH_MAX_WRITE_SIZE)
 		seq_printf(m, ",wsize=%d", fsopt->wsize);
 	if (fsopt->rsize != CEPH_MAX_READ_SIZE)
 		seq_printf(m, ",rsize=%d", fsopt->rsize);