Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / hfsplus / options.c

diff --git a/fs/hfsplus/options.c b/fs/hfsplus/options.c
index 1cca010..dc64fac 100644 (file)
--- 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 {
@@ -20,7 +22,7 @@ enum {
        opt_umask, opt_uid, opt_gid,
        opt_part, opt_session, opt_nls,
        opt_nodecompose, opt_decompose,
-       opt_err
+       opt_force, opt_err
 };
 
 static match_table_t tokens = {
@@ -34,11 +36,12 @@ static match_table_t tokens = {
        { opt_nls, "nls=%s" },
        { opt_decompose, "decompose" },
        { opt_nodecompose, "nodecompose" },
+       { opt_force, "force" },
        { opt_err, NULL }
 };
 
 /* 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 +66,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];
@@ -80,58 +83,58 @@ int parse_options(char *input, struct hfsplus_sb_info *sbi)
                switch (token) {
                case opt_creator:
                        if (match_fourchar(&args[0], &sbi->creator)) {
-                               printk("HFS+-fs: creator requires a 4 character value\n");
+                               printk(KERN_ERR "hfs: creator requires a 4 character value\n");
                                return 0;
                        }
                        break;
                case opt_type:
                        if (match_fourchar(&args[0], &sbi->type)) {
-                               printk("HFS+-fs: type requires a 4 character value\n");
+                               printk(KERN_ERR "hfs: type requires a 4 character value\n");
                                return 0;
                        }
                        break;
                case opt_umask:
                        if (match_octal(&args[0], &tmp)) {
-                               printk("HFS+-fs: umask requires a value\n");
+                               printk(KERN_ERR "hfs: umask requires a value\n");
                                return 0;
                        }
                        sbi->umask = (umode_t)tmp;
                        break;
                case opt_uid:
                        if (match_int(&args[0], &tmp)) {
-                               printk("HFS+-fs: uid requires an argument\n");
+                               printk(KERN_ERR "hfs: uid requires an argument\n");
                                return 0;
                        }
                        sbi->uid = (uid_t)tmp;
                        break;
                case opt_gid:
                        if (match_int(&args[0], &tmp)) {
-                               printk("HFS+-fs: gid requires an argument\n");
+                               printk(KERN_ERR "hfs: gid requires an argument\n");
                                return 0;
                        }
                        sbi->gid = (gid_t)tmp;
                        break;
                case opt_part:
                        if (match_int(&args[0], &sbi->part)) {
-                               printk("HFS+-fs: part requires an argument\n");
+                               printk(KERN_ERR "hfs: part requires an argument\n");
                                return 0;
                        }
                        break;
                case opt_session:
                        if (match_int(&args[0], &sbi->session)) {
-                               printk("HFS+-fs: session requires an argument\n");
+                               printk(KERN_ERR "hfs: session requires an argument\n");
                                return 0;
                        }
                        break;
                case opt_nls:
                        if (sbi->nls) {
-                               printk("HFS+-fs: unable to change nls mapping\n");
+                               printk(KERN_ERR "hfs: unable to change nls mapping\n");
                                return 0;
                        }
                        p = match_strdup(&args[0]);
                        sbi->nls = load_nls(p);
                        if (!sbi->nls) {
-                               printk("HFS+-fs: unable to load nls mapping \"%s\"\n", p);
+                               printk(KERN_ERR "hfs: unable to load nls mapping \"%s\"\n", p);
                                kfree(p);
                                return 0;
                        }
@@ -143,6 +146,9 @@ int parse_options(char *input, struct hfsplus_sb_info *sbi)
                case opt_nodecompose:
                        sbi->flags |= HFSPLUS_SB_NODECOMPOSE;
                        break;
+               case opt_force:
+                       sbi->flags |= HFSPLUS_SB_FORCE;
+                       break;
                default:
                        return 0;
                }
@@ -160,3 +166,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;
+}