X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fhfs%2Fsuper.c;h=1181d116117dc52f40b503190a03e28053517eaa;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=345651903fe0068144101ebabea6adcad2f79603;hpb=9bf4aaab3e101692164d49b7ca357651eb691cb6;p=linux-2.6.git

diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index 345651903..1181d1161 100644
--- a/fs/hfs/super.c
+++ b/fs/hfs/super.c
@@ -15,14 +15,16 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/blkdev.h>
+#include <linux/mount.h>
 #include <linux/init.h>
+#include <linux/nls.h>
+#include <linux/parser.h>
+#include <linux/seq_file.h>
 #include <linux/vfs.h>
 
 #include "hfs_fs.h"
 #include "btree.h"
 
-const char hfs_version[]="0.96";
-
 static kmem_cache_t *hfs_inode_cachep;
 
 MODULE_LICENSE("GPL");
@@ -92,20 +94,19 @@ static int hfs_statfs(struct super_block *sb, struct kstatfs *buf)
 	return 0;
 }
 
-int hfs_remount(struct super_block *sb, int *flags, char *data)
+static int hfs_remount(struct super_block *sb, int *flags, char *data)
 {
 	*flags |= MS_NODIRATIME;
 	if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
 		return 0;
 	if (!(*flags & MS_RDONLY)) {
-		if (!(HFS_SB(sb)->mdb->drAtrb & cpu_to_be16(HFS_SB_ATTRIB_UNMNT))
-		    || (HFS_SB(sb)->mdb->drAtrb & cpu_to_be16(HFS_SB_ATTRIB_INCNSTNT))) {
-			printk("HFS-fs warning: Filesystem was not cleanly unmounted, "
+		if (!(HFS_SB(sb)->mdb->drAtrb & cpu_to_be16(HFS_SB_ATTRIB_UNMNT))) {
+			printk(KERN_WARNING "hfs: filesystem was not cleanly unmounted, "
 			       "running fsck.hfs is recommended.  leaving read-only.\n");
 			sb->s_flags |= MS_RDONLY;
 			*flags |= MS_RDONLY;
 		} else if (HFS_SB(sb)->mdb->drAtrb & cpu_to_be16(HFS_SB_ATTRIB_SLOCK)) {
-			printk("HFS-fs: Filesystem is marked locked, leaving read-only.\n");
+			printk(KERN_WARNING "hfs: filesystem is marked locked, leaving read-only.\n");
 			sb->s_flags |= MS_RDONLY;
 			*flags |= MS_RDONLY;
 		}
@@ -113,6 +114,32 @@ int hfs_remount(struct super_block *sb, int *flags, char *data)
 	return 0;
 }
 
+static int hfs_show_options(struct seq_file *seq, struct vfsmount *mnt)
+{
+	struct hfs_sb_info *sbi = HFS_SB(mnt->mnt_sb);
+
+	if (sbi->s_creator != cpu_to_be32(0x3f3f3f3f))
+		seq_printf(seq, ",creator=%.4s", (char *)&sbi->s_creator);
+	if (sbi->s_type != cpu_to_be32(0x3f3f3f3f))
+		seq_printf(seq, ",type=%.4s", (char *)&sbi->s_type);
+	seq_printf(seq, ",uid=%u,gid=%u", sbi->s_uid, sbi->s_gid);
+	if (sbi->s_file_umask != 0133)
+		seq_printf(seq, ",file_umask=%o", sbi->s_file_umask);
+	if (sbi->s_dir_umask != 0022)
+		seq_printf(seq, ",dir_umask=%o", sbi->s_dir_umask);
+	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_disk)
+		seq_printf(seq, ",codepage=%s", sbi->nls_disk->charset);
+	if (sbi->nls_io)
+		seq_printf(seq, ",iocharset=%s", sbi->nls_io->charset);
+	if (sbi->s_quiet)
+		seq_printf(seq, ",quiet");
+	return 0;
+}
+
 static struct inode *hfs_alloc_inode(struct super_block *sb)
 {
 	struct hfs_inode_info *i;
@@ -135,8 +162,40 @@ static struct super_operations hfs_super_operations = {
 	.write_super	= hfs_write_super,
 	.statfs		= hfs_statfs,
 	.remount_fs     = hfs_remount,
+	.show_options	= hfs_show_options,
+};
+
+enum {
+	opt_uid, opt_gid, opt_umask, opt_file_umask, opt_dir_umask,
+	opt_part, opt_session, opt_type, opt_creator, opt_quiet,
+	opt_codepage, opt_iocharset,
+	opt_err
+};
+
+static match_table_t tokens = {
+	{ opt_uid, "uid=%u" },
+	{ opt_gid, "gid=%u" },
+	{ opt_umask, "umask=%o" },
+	{ opt_file_umask, "file_umask=%o" },
+	{ opt_dir_umask, "dir_umask=%o" },
+	{ opt_part, "part=%u" },
+	{ opt_session, "session=%u" },
+	{ opt_type, "type=%s" },
+	{ opt_creator, "creator=%s" },
+	{ opt_quiet, "quiet" },
+	{ opt_codepage, "codepage=%s" },
+	{ opt_iocharset, "iocharset=%s" },
+	{ opt_err, NULL }
 };
 
+static inline int match_fourchar(substring_t *arg, u32 *result)
+{
+	if (arg->to - arg->from != 4)
+		return -EINVAL;
+	memcpy(result, arg->from, 4);
+	return 0;
+}
+
 /*
  * parse_options()
  *
@@ -145,15 +204,16 @@ static struct super_operations hfs_super_operations = {
  */
 static int parse_options(char *options, struct hfs_sb_info *hsb)
 {
-	char *this_char, *value;
+	char *p;
+	substring_t args[MAX_OPT_ARGS];
+	int tmp, token;
 
 	/* initialize the sb with defaults */
 	hsb->s_uid = current->uid;
 	hsb->s_gid = current->gid;
-	hsb->s_file_umask = 0644;
-	hsb->s_dir_umask = 0755;
-	hsb->s_type = 0x3f3f3f3f;	/* == '????' */
-	hsb->s_creator = 0x3f3f3f3f;	/* == '????' */
+	hsb->s_file_umask = 0133;
+	hsb->s_dir_umask = 0022;
+	hsb->s_type = hsb->s_creator = cpu_to_be32(0x3f3f3f3f);	/* == '????' */
 	hsb->s_quiet = 0;
 	hsb->part = -1;
 	hsb->session = -1;
@@ -161,77 +221,117 @@ static int parse_options(char *options, struct hfs_sb_info *hsb)
 	if (!options)
 		return 1;
 
-	while ((this_char = strsep(&options, ",")) != 0) {
-		if (!*this_char)
+	while ((p = strsep(&options, ",")) != NULL) {
+		if (!*p)
 			continue;
-		value = strchr(this_char, '=');
-		if (value)
-			*value++ = 0;
 
-	/* Numeric-valued options */
-		if (!strcmp(this_char, "uid")) {
-			if (!value || !*value)
-				return 0;
-			hsb->s_uid = simple_strtoul(value, &value, 0);
-			if (*value)
-				return 0;
-		} else if (!strcmp(this_char, "gid")) {
-			if (!value || !*value)
+		token = match_token(p, tokens, args);
+		switch (token) {
+		case opt_uid:
+			if (match_int(&args[0], &tmp)) {
+				printk(KERN_ERR "hfs: uid requires an argument\n");
 				return 0;
-			hsb->s_gid = simple_strtoul(value, &value, 0);
-			if (*value)
+			}
+			hsb->s_uid = (uid_t)tmp;
+			break;
+		case opt_gid:
+			if (match_int(&args[0], &tmp)) {
+				printk(KERN_ERR "hfs: gid requires an argument\n");
 				return 0;
-		} else if (!strcmp(this_char, "umask")) {
-			if (!value || !*value)
+			}
+			hsb->s_gid = (gid_t)tmp;
+			break;
+		case opt_umask:
+			if (match_octal(&args[0], &tmp)) {
+				printk(KERN_ERR "hfs: umask requires a value\n");
 				return 0;
-			hsb->s_file_umask = simple_strtoul(value, &value, 8);
-			hsb->s_dir_umask = hsb->s_file_umask;
-			if (*value)
+			}
+			hsb->s_file_umask = (umode_t)tmp;
+			hsb->s_dir_umask = (umode_t)tmp;
+			break;
+		case opt_file_umask:
+			if (match_octal(&args[0], &tmp)) {
+				printk(KERN_ERR "hfs: file_umask requires a value\n");
 				return 0;
-		} else if (!strcmp(this_char, "file_umask")) {
-			if (!value || !*value)
+			}
+			hsb->s_file_umask = (umode_t)tmp;
+			break;
+		case opt_dir_umask:
+			if (match_octal(&args[0], &tmp)) {
+				printk(KERN_ERR "hfs: dir_umask requires a value\n");
 				return 0;
-			hsb->s_file_umask = simple_strtoul(value, &value, 8);
-			if (*value)
+			}
+			hsb->s_dir_umask = (umode_t)tmp;
+			break;
+		case opt_part:
+			if (match_int(&args[0], &hsb->part)) {
+				printk(KERN_ERR "hfs: part requires an argument\n");
 				return 0;
-		} else if (!strcmp(this_char, "dir_umask")) {
-			if (!value || !*value)
+			}
+			break;
+		case opt_session:
+			if (match_int(&args[0], &hsb->session)) {
+				printk(KERN_ERR "hfs: session requires an argument\n");
 				return 0;
-			hsb->s_dir_umask = simple_strtoul(value, &value, 8);
-			if (*value)
+			}
+			break;
+		case opt_type:
+			if (match_fourchar(&args[0], &hsb->s_type)) {
+				printk(KERN_ERR "hfs: type requires a 4 character value\n");
 				return 0;
-		} else if (!strcmp(this_char, "part")) {
-			if (!value || !*value)
+			}
+			break;
+		case opt_creator:
+			if (match_fourchar(&args[0], &hsb->s_creator)) {
+				printk(KERN_ERR "hfs: creator requires a 4 character value\n");
 				return 0;
-			hsb->part = simple_strtoul(value, &value, 0);
-			if (*value)
-				return 0;
-		} else if (!strcmp(this_char, "session")) {
-			if (!value || !*value)
-				return 0;
-			hsb->session = simple_strtoul(value, &value, 0);
-			if (*value)
+			}
+			break;
+		case opt_quiet:
+			hsb->s_quiet = 1;
+			break;
+		case opt_codepage:
+			if (hsb->nls_disk) {
+				printk(KERN_ERR "hfs: unable to change codepage\n");
 				return 0;
-	/* String-valued options */
-		} else if (!strcmp(this_char, "type") && value) {
-			if (strlen(value) != 4)
+			}
+			p = match_strdup(&args[0]);
+			hsb->nls_disk = load_nls(p);
+			if (!hsb->nls_disk) {
+				printk(KERN_ERR "hfs: unable to load codepage \"%s\"\n", p);
+				kfree(p);
 				return 0;
-			hsb->s_type = *(u32 *)value;
-		} else if (!strcmp(this_char, "creator") && value) {
-			if (strlen(value) != 4)
+			}
+			kfree(p);
+			break;
+		case opt_iocharset:
+			if (hsb->nls_io) {
+				printk(KERN_ERR "hfs: unable to change iocharset\n");
 				return 0;
-			hsb->s_creator = *(u32 *)value;
-	/* Boolean-valued options */
-		} else if (!strcmp(this_char, "quiet")) {
-			if (value)
+			}
+			p = match_strdup(&args[0]);
+			hsb->nls_io = load_nls(p);
+			if (!hsb->nls_io) {
+				printk(KERN_ERR "hfs: unable to load iocharset \"%s\"\n", p);
+				kfree(p);
 				return 0;
-			hsb->s_quiet = 1;
-		} else
+			}
+			kfree(p);
+			break;
+		default:
 			return 0;
+		}
 	}
 
+	if (hsb->nls_disk && !hsb->nls_io) {
+		hsb->nls_io = load_nls_default();
+		if (!hsb->nls_io) {
+			printk(KERN_ERR "hfs: unable to load default iocharset\n");
+			return 0;
+		}
+	}
 	hsb->s_dir_umask &= 0777;
-	hsb->s_file_umask &= 0777;
+	hsb->s_file_umask &= 0577;
 
 	return 1;
 }
@@ -264,8 +364,8 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
 
 	res = -EINVAL;
 	if (!parse_options((char *)data, sbi)) {
-		hfs_warn("hfs_fs: unable to parse mount options.\n");
-		goto bail3;
+		printk(KERN_ERR "hfs: unable to parse mount options.\n");
+		goto bail;
 	}
 
 	sb->s_op = &hfs_super_operations;
@@ -275,10 +375,10 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
 	res = hfs_mdb_get(sb);
 	if (res) {
 		if (!silent)
-			hfs_warn("VFS: Can't find a HFS filesystem on dev %s.\n",
+			printk(KERN_WARNING "hfs: can't find a HFS filesystem on dev %s.\n",
 				hfs_mdb_name(sb));
 		res = -EINVAL;
-		goto bail2;
+		goto bail;
 	}
 
 	/* try to get the root inode */
@@ -307,11 +407,9 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
 bail_iput:
 	iput(root_inode);
 bail_no_root:
-	hfs_warn("hfs_fs: get root inode failed.\n");
+	printk(KERN_ERR "hfs: get root inode failed.\n");
+bail:
 	hfs_mdb_put(sb);
-bail2:
-bail3:
-	kfree(sbi);
 	return res;
 }
 
@@ -356,7 +454,7 @@ static void __exit exit_hfs_fs(void)
 {
 	unregister_filesystem(&hfs_fs_type);
 	if (kmem_cache_destroy(hfs_inode_cachep))
-		printk(KERN_INFO "hfs_inode_cache: not all structures were freed\n");
+		printk(KERN_ERR "hfs_inode_cache: not all structures were freed\n");
 }
 
 module_init(init_hfs_fs)