4 files changed, 33 insertions, 30 deletions

diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c
index 8868d3b766fd..b85abc6e6f83 100644
--- a/fs/hfsplus/bnode.c
+++ b/fs/hfsplus/bnode.c
@@ -18,8 +18,6 @@
 #include "hfsplus_fs.h"
 #include "hfsplus_raw.h"
 
-#define REF_PAGES       0
-
 /* Copy a specified range of bytes from the raw data of a node */
 void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len)
 {
@@ -450,9 +448,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)
                         page_cache_release(page);
                         goto fail;
                 }
-#if !REF_PAGES
                 page_cache_release(page);
-#endif
                 node->page[i] = page;
         }
 
@@ -612,13 +608,6 @@ void hfs_bnode_get(struct hfs_bnode *node)
 {
         if (node) {
                 atomic_inc(&node->refcnt);
-#if REF_PAGES
-                {
-                int i;
-                for (i = 0; i < node->tree->pages_per_bnode; i++)
-                        get_page(node->page[i]);
-                }
-#endif
                 dprint(DBG_BNODE_REFS, "get_node(%d:%d): %d\n",
                        node->tree->cnid, node->this, atomic_read(&node->refcnt));
         }
@@ -635,20 +624,12 @@ void hfs_bnode_put(struct hfs_bnode *node)
                        node->tree->cnid, node->this, atomic_read(&node->refcnt));
                 if (!atomic_read(&node->refcnt))
                         BUG();
-                if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock)) {
-#if REF_PAGES
-                        for (i = 0; i < tree->pages_per_bnode; i++)
-                                put_page(node->page[i]);
-#endif
+                if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock))
                         return;
-                }
                 for (i = 0; i < tree->pages_per_bnode; i++) {
                         if (!node->page[i])
                                 continue;
                         mark_page_accessed(node->page[i]);
-#if REF_PAGES
-                        put_page(node->page[i]);
-#endif
                 }
 
                 if (test_bit(HFS_BNODE_DELETED, &node->flags)) {
diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h
index 533094a570df..2bc0cdd30e56 100644
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
@@ -343,8 +343,9 @@ ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name,
 ssize_t hfsplus_listxattr(struct dentry *dentry, char *buffer, size_t size);
 
 /* options.c */
-int parse_options(char *, struct hfsplus_sb_info *);
-void fill_defaults(struct hfsplus_sb_info *);
+int hfsplus_parse_options(char *, struct hfsplus_sb_info *);
+void hfsplus_fill_defaults(struct hfsplus_sb_info *);
+int hfsplus_show_options(struct seq_file *, struct vfsmount *);
 
 /* tables.c */
 extern u16 hfsplus_case_fold_table[];
diff --git a/fs/hfsplus/options.c b/fs/hfsplus/options.c
index 1cca0102c98d..cca0818aa4ca 100644
--- a/fs/hfsplus/options.c
+++ b/fs/hfsplus/options.c
@@ -13,6 +13,8 @@
 #include <linux/sched.h>
 #include <linux/parser.h>
 #include <linux/nls.h>
+#include <linux/mount.h>
+#include <linux/seq_file.h>
 #include "hfsplus_fs.h"
 
 enum {
@@ -38,7 +40,7 @@ static match_table_t tokens = {
 };
 
 /* Initialize an options object to reasonable defaults */
-void fill_defaults(struct hfsplus_sb_info *opts)
+void hfsplus_fill_defaults(struct hfsplus_sb_info *opts)
 {
         if (!opts)
                 return;
@@ -63,7 +65,7 @@ static inline int match_fourchar(substring_t *arg, u32 *result)
 
 /* Parse options from mount. Returns 0 on failure */
 /* input is the options passed to mount() as a string */
-int parse_options(char *input, struct hfsplus_sb_info *sbi)
+int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi)
 {
         char *p;
         substring_t args[MAX_OPT_ARGS];
@@ -160,3 +162,23 @@ done:
 
         return 1;
 }
+
+int hfsplus_show_options(struct seq_file *seq, struct vfsmount *mnt)
+{
+        struct hfsplus_sb_info *sbi = &HFSPLUS_SB(mnt->mnt_sb);
+
+        if (sbi->creator != HFSPLUS_DEF_CR_TYPE)
+                seq_printf(seq, ",creator=%.4s", (char *)&sbi->creator);
+        if (sbi->type != HFSPLUS_DEF_CR_TYPE)
+                seq_printf(seq, ",type=%.4s", (char *)&sbi->type);
+        seq_printf(seq, ",umask=%o,uid=%u,gid=%u", sbi->umask, sbi->uid, sbi->gid);
+        if (sbi->part >= 0)
+                seq_printf(seq, ",part=%u", sbi->part);
+        if (sbi->session >= 0)
+                seq_printf(seq, ",session=%u", sbi->session);
+        if (sbi->nls)
+                seq_printf(seq, ",nls=%s", sbi->nls->charset);
+        if (sbi->flags & HFSPLUS_SB_NODECOMPOSE)
+                seq_printf(seq, ",nodecompose");
+        return 0;
+}
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index d55ad67b8e42..fd0f0f050e1d 100644
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -217,8 +217,7 @@ static void hfsplus_put_super(struct super_block *sb)
                 vhdr->attributes |= cpu_to_be32(HFSPLUS_VOL_UNMNT);
                 vhdr->attributes &= cpu_to_be32(~HFSPLUS_VOL_INCNSTNT);
                 mark_buffer_dirty(HFSPLUS_SB(sb).s_vhbh);
-                ll_rw_block(WRITE, 1, &HFSPLUS_SB(sb).s_vhbh);
-                wait_on_buffer(HFSPLUS_SB(sb).s_vhbh);
+                sync_dirty_buffer(HFSPLUS_SB(sb).s_vhbh);
         }
 
         hfs_btree_close(HFSPLUS_SB(sb).cat_tree);
@@ -277,6 +276,7 @@ static struct super_operations hfsplus_sops = {
         .write_super    = hfsplus_write_super,
         .statfs         = hfsplus_statfs,
         .remount_fs     = hfsplus_remount,
+        .show_options   = hfsplus_show_options,
 };
 
 static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
@@ -297,8 +297,8 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
         memset(sbi, 0, sizeof(HFSPLUS_SB(sb)));
         sb->s_fs_info = sbi;
         INIT_HLIST_HEAD(&sbi->rsrc_inodes);
-        fill_defaults(sbi);
-        if (!parse_options(data, sbi)) {
+        hfsplus_fill_defaults(sbi);
+        if (!hfsplus_parse_options(data, sbi)) {
                 if (!silent)
                         printk("HFS+-fs: unable to parse mount options\n");
                 err = -EINVAL;
@@ -415,8 +415,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
         vhdr->attributes &= cpu_to_be32(~HFSPLUS_VOL_UNMNT);
         vhdr->attributes |= cpu_to_be32(HFSPLUS_VOL_INCNSTNT);
         mark_buffer_dirty(HFSPLUS_SB(sb).s_vhbh);
-        ll_rw_block(WRITE, 1, &HFSPLUS_SB(sb).s_vhbh);
-        wait_on_buffer(HFSPLUS_SB(sb).s_vhbh);
+        sync_dirty_buffer(HFSPLUS_SB(sb).s_vhbh);
 
         if (!HFSPLUS_SB(sb).hidden_dir) {
                 printk("HFS+: create hidden dir...\n");