1 files changed, 50 insertions, 12 deletions

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index c034b5129c1e..0e2a1b45bf92 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -39,6 +39,7 @@
 #include <linux/parser.h>
 #include <linux/crc32.h>
 #include <linux/debugfs.h>
+#include <linux/mount.h>
 
 #include <cluster/nodemanager.h>
 
@@ -91,6 +92,7 @@ struct mount_options
 static int ocfs2_parse_options(struct super_block *sb, char *options,
                                struct mount_options *mopt,
                                int is_remount);
+static int ocfs2_show_options(struct seq_file *s, struct vfsmount *mnt);
 static void ocfs2_put_super(struct super_block *sb);
 static int ocfs2_mount_volume(struct super_block *sb);
 static int ocfs2_remount(struct super_block *sb, int *flags, char *data);
@@ -105,7 +107,7 @@ static int ocfs2_sync_fs(struct super_block *sb, int wait);
 
 static int ocfs2_init_global_system_inodes(struct ocfs2_super *osb);
 static int ocfs2_init_local_system_inodes(struct ocfs2_super *osb);
-static int ocfs2_release_system_inodes(struct ocfs2_super *osb);
+static void ocfs2_release_system_inodes(struct ocfs2_super *osb);
 static int ocfs2_fill_local_node_info(struct ocfs2_super *osb);
 static int ocfs2_check_volume(struct ocfs2_super *osb);
 static int ocfs2_verify_volume(struct ocfs2_dinode *di,
@@ -133,6 +135,7 @@ static const struct super_operations ocfs2_sops = {
         .write_super    = ocfs2_write_super,
         .put_super      = ocfs2_put_super,
         .remount_fs     = ocfs2_remount,
+        .show_options   = ocfs2_show_options,
 };
 
 enum {
@@ -177,7 +180,7 @@ static void ocfs2_write_super(struct super_block *sb)
 
 static int ocfs2_sync_fs(struct super_block *sb, int wait)
 {
-        int status = 0;
+        int status;
         tid_t target;
         struct ocfs2_super *osb = OCFS2_SB(sb);
 
@@ -275,9 +278,9 @@ bail:
         return status;
 }
 
-static int ocfs2_release_system_inodes(struct ocfs2_super *osb)
+static void ocfs2_release_system_inodes(struct ocfs2_super *osb)
 {
-        int status = 0, i;
+        int i;
         struct inode *inode;
 
         mlog_entry_void();
@@ -302,8 +305,7 @@ static int ocfs2_release_system_inodes(struct ocfs2_super *osb)
                 osb->root_inode = NULL;
         }
 
-        mlog_exit(status);
-        return status;
+        mlog_exit(0);
 }
 
 /* We're allocating fs objects, use GFP_NOFS */
@@ -453,7 +455,7 @@ static int ocfs2_sb_probe(struct super_block *sb,
                           struct buffer_head **bh,
                           int *sector_size)
 {
-        int status = 0, tmpstat;
+        int status, tmpstat;
         struct ocfs1_vol_disk_hdr *hdr;
         struct ocfs2_dinode *di;
         int blksize;
@@ -830,6 +832,41 @@ bail:
         return status;
 }
 
+static int ocfs2_show_options(struct seq_file *s, struct vfsmount *mnt)
+{
+        struct ocfs2_super *osb = OCFS2_SB(mnt->mnt_sb);
+        unsigned long opts = osb->s_mount_opt;
+
+        if (opts & OCFS2_MOUNT_HB_LOCAL)
+                seq_printf(s, ",_netdev,heartbeat=local");
+        else
+                seq_printf(s, ",heartbeat=none");
+
+        if (opts & OCFS2_MOUNT_NOINTR)
+                seq_printf(s, ",nointr");
+
+        if (opts & OCFS2_MOUNT_DATA_WRITEBACK)
+                seq_printf(s, ",data=writeback");
+        else
+                seq_printf(s, ",data=ordered");
+
+        if (opts & OCFS2_MOUNT_BARRIER)
+                seq_printf(s, ",barrier=1");
+
+        if (opts & OCFS2_MOUNT_ERRORS_PANIC)
+                seq_printf(s, ",errors=panic");
+        else
+                seq_printf(s, ",errors=remount-ro");
+
+        if (osb->preferred_slot != OCFS2_INVALID_SLOT)
+                seq_printf(s, ",preferred_slot=%d", osb->preferred_slot);
+
+        if (osb->s_atime_quantum != OCFS2_DEFAULT_ATIME_QUANTUM)
+                seq_printf(s, ",atime_quantum=%u", osb->s_atime_quantum);
+
+        return 0;
+}
+
 static int __init ocfs2_init(void)
 {
         int status;
@@ -1209,12 +1246,13 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err)
                 tmp = ocfs2_request_umount_vote(osb);
                 if (tmp < 0)
                         mlog_errno(tmp);
+        }
 
-                if (osb->slot_num != OCFS2_INVALID_SLOT)
-                        ocfs2_put_slot(osb);
+        if (osb->slot_num != OCFS2_INVALID_SLOT)
+                ocfs2_put_slot(osb);
 
+        if (osb->dlm)
                 ocfs2_super_unlock(osb, 1);
-        }
 
         ocfs2_release_system_inodes(osb);
 
@@ -1275,7 +1313,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
                                   struct buffer_head *bh,
                                   int sector_size)
 {
-        int status = 0;
+        int status;
         int i, cbits, bbits;
         struct ocfs2_dinode *di = (struct ocfs2_dinode *)bh->b_data;
         struct inode *inode = NULL;
@@ -1596,7 +1634,7 @@ static int ocfs2_verify_volume(struct ocfs2_dinode *di,
 
 static int ocfs2_check_volume(struct ocfs2_super *osb)
 {
-        int status = 0;
+        int status;
         int dirty;
         int local;
         struct ocfs2_dinode *local_alloc = NULL; /* only used if we