diff -ruN linux-source-2.6.24.orig/fs/asfs/super.c linux-source-2.6.24/fs/asfs/super.c
--- linux-source-2.6.24.orig/fs/asfs/super.c 1970-01-01 03:00:00.000000000 +0300
+++ linux-source-2.6.24/fs/asfs/super.c 2008-12-14 23:41:40.000000000 +0300
@@ -0,0 +1,493 @@
+/*
+ *
+ * Amiga Smart File System, Linux implementation
+ *
+ * version: 1.0beta12 for 2.6.19 kernel
+ *
+ * Copyright (C) 2003,2004,2005,2006 Marek 'March' Szyprowski <marek@xxxxxxxx>
+ *
+ * NLS support by Pavel Fedin (C) 2005
+ *
+ *
+ * Thanks to Marcin Kurek (Morgoth/Dreamolers-CAPS) for help and parts
+ * of original amiga version of SmartFilesystem source code.
+ *
+ * SmartFilesystem is copyrighted (C) 2003 by: John Hendrikx,
+ * Ralph Schmidt, Emmanuel Lesueur, David Gerber and Marcin Kurek
+ *
+ *
+ * ASFS is based on the Amiga FFS filesystem for Linux
+ * Copyright (C) 1993 Ray Burr
+ * Copyright (C) 1996 Hans-Joachim Widmaier
+ *
+ * Earlier versions were based on the Linux implementation of
+ * the ROMFS file system
+ * Copyright (C) 1997-1999 Janos Farkas <chexum@xxxxxxxxxxxxxxx>
+ *
+ * ASFS used some parts of the smbfs filesystem:
+ * Copyright (C) 1995, 1996 by Paal-Kr. Engstad and Volker Lendecke
+ * Copyright (C) 1997 by Volker Lendecke
+ *
+ * and parts of the Minix filesystem additionally
+ * Copyright (C) 1991, 1992 Linus Torvalds
+ * Copyright (C) 1996 Gertjan van Wingerde
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ */
+
+/* todo:
+ * - remove bugs
+ * - add missing features (maybe safe-delete, other...)
+ * - create other fs tools like mkfs.asfs and fsck.asfs, some data-recovery tools
+ */
+
+#define ASFS_VERSION "1.0beta12 (03.12.2006)"
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/slab.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/smp_lock.h>
+#include <linux/buffer_head.h>
+#include <linux/vfs.h>
+#include <linux/parser.h>
+#include <linux/nls.h>
+#include "asfs_fs.h"
+
+#include <asm/byteorder.h>
+#include <asm/uaccess.h>
+
+static void asfs_put_super(struct super_block *sb);
+static int asfs_statfs(struct dentry *dentry, struct kstatfs *buf);
+#ifdef CONFIG_ASFS_RW
+static int asfs_remount(struct super_block *sb, int *flags, char *data);
+#endif
+static struct inode *asfs_alloc_inode(struct super_block *sb);
+static void asfs_destroy_inode(struct inode *inode);
+
+static char asfs_default_codepage[] = CONFIG_ASFS_DEFAULT_CODEPAGE;
+static char asfs_default_iocharset[] = CONFIG_NLS_DEFAULT;
+
+u32 asfs_calcchecksum(void *block, u32 blocksize)
+{
+ u32 *data = block, checksum = 1;
+ while (blocksize > 0) {
+ checksum += be32_to_cpu(*data++);
+ blocksize -= 4;
+ }
+ checksum -= be32_to_cpu(((struct fsBlockHeader *)block)->checksum);
+ return -checksum;
+}
+
+static struct super_operations asfs_ops = {
+ .alloc_inode = asfs_alloc_inode,
+ .destroy_inode = asfs_destroy_inode,
+ .put_super = asfs_put_super,
+ .statfs = asfs_statfs,
+#ifdef CONFIG_ASFS_RW
+ .remount_fs = asfs_remount,
+#endif
+};
+
+extern struct dentry_operations asfs_dentry_operations;
+
+enum {
+ Opt_mode, Opt_setgid, Opt_setuid, Opt_prefix, Opt_volume,
+ Opt_lcvol, Opt_iocharset, Opt_codepage, Opt_ignore, Opt_err
+};
+
+static match_table_t tokens = {
+ {Opt_mode, "mode=%o"},
+ {Opt_setgid, "setgid=%u"},
+ {Opt_setuid, "setuid=%u"},
+ {Opt_prefix, "prefix=%s"},
+ {Opt_volume, "volume=%s"},
+ {Opt_lcvol, "lowercasevol"},
+ {Opt_iocharset, "iocharset=%s"},
+ {Opt_codepage, "codepage=%s"},
+ {Opt_ignore, "grpquota"},
+ {Opt_ignore, "noquota"},
+ {Opt_ignore, "quota"},
+ {Opt_ignore, "usrquota"},
+ {Opt_err, NULL},
+};
+
+static int asfs_parse_options(char *options, struct super_block *sb)
+{
+ char *p;
+ substring_t args[MAX_OPT_ARGS];
+
+ if (!options)
+ return 1;
+ while ((p = strsep(&options, ",")) != NULL) {
+ int token, option;
+ if (!*p)
+ continue;
+ token = match_token(p, tokens, args);
+
+ switch (token) {
+ case Opt_mode:
+ if (match_octal(&args[0], &option))
+ goto no_arg;
+ ASFS_SB(sb)->mode = option & 0777;
+ break;
+ case Opt_setgid:
+ if (match_int(&args[0], &option))
+ goto no_arg;
+ ASFS_SB(sb)->gid = option;
+ break;
+ case Opt_setuid:
+ if (match_int(&args[0], &option))
+ goto no_arg;
+ ASFS_SB(sb)->uid = option;
+ break;
+ case Opt_prefix:
+ if (ASFS_SB(sb)->prefix) {
+ kfree(ASFS_SB(sb)->prefix);
+ ASFS_SB(sb)->prefix = NULL;
+ }
+ ASFS_SB(sb)->prefix = match_strdup(&args[0]);
+ if (! ASFS_SB(sb)->prefix)
+ return 0;
+ break;
+ case Opt_volume:
+ if (ASFS_SB(sb)->root_volume) {
+ kfree(ASFS_SB(sb)->root_volume);
+ ASFS_SB(sb)->root_volume = NULL;
+ }
+ ASFS_SB(sb)->root_volume = match_strdup(&args[0]);
+ if (! ASFS_SB(sb)->root_volume)
+ return 0;
+ break;
+ case Opt_lcvol:
+ ASFS_SB(sb)->flags |= ASFS_VOL_LOWERCASE;
+ break;
+ case Opt_iocharset:
+ if (ASFS_SB(sb)->iocharset != asfs_default_iocharset)
+ kfree(ASFS_SB(sb)->iocharset);
+ ASFS_SB(sb)->iocharset = match_strdup(&args[0]);
+ if (!ASFS_SB(sb)->iocharset)
+ return 0;
+ break;
+ case Opt_codepage:
+ if (ASFS_SB(sb)->codepage != asfs_default_codepage)
+ kfree(ASFS_SB(sb)->codepage);
+ ASFS_SB(sb)->codepage = match_strdup(&args[0]);
+ if (!ASFS_SB(sb)->codepage)
+ return 0;
+ case Opt_ignore:
+ /* Silently ignore the quota options */
+ break;
+ default:
+no_arg:
+ printk("ASFS: Unrecognized mount option \"%s\" "
+ "or missing value\n", p);
+ return 0;
+ }
+ }
+ return 1;
+}
+
+static int asfs_fill_super(struct super_block *sb, void *data, int silent)
+{
+ struct asfs_sb_info *sbi;
+ struct buffer_head *bh;
+ struct fsRootBlock *rootblock;
+ struct inode *rootinode;
+
+ sbi = kzalloc(sizeof(struct asfs_sb_info), GFP_KERNEL);
+ if (!sbi)
+ return -ENOMEM;
+ sb->s_fs_info = sbi;
+
+ /* Fill in defaults */
+ ASFS_SB(sb)->uid = ASFS_DEFAULT_UID;
+ ASFS_SB(sb)->gid = ASFS_DEFAULT_GID;
+ ASFS_SB(sb)->mode = ASFS_DEFAULT_MODE;
+ ASFS_SB(sb)->prefix = NULL;
+ ASFS_SB(sb)->root_volume = NULL;
+ ASFS_SB(sb)->flags = 0;
+ ASFS_SB(sb)->iocharset = asfs_default_iocharset;
+ ASFS_SB(sb)->codepage = asfs_default_codepage;
+
+ if (!asfs_parse_options(data, sb)) {
+ printk(KERN_ERR "ASFS: Error parsing options\n");
+ return -EINVAL;
+ }
+
+ if (!sb_set_blocksize(sb, 512))
+ return -EINVAL;
+ sb->s_maxbytes = ASFS_MAXFILESIZE;
+
+ bh = sb_bread(sb, 0);
+ if (!bh) {
+ printk(KERN_ERR "ASFS: unable to read superblock\n");
+ return -EINVAL;
+ }
+
+ rootblock = (struct fsRootBlock *)bh->b_data;
+
+ if (be32_to_cpu(rootblock->bheader.id) == ASFS_ROOTID &&
+ be16_to_cpu(rootblock->version) == ASFS_STRUCTURE_VERISON) {
+
+ sb->s_blocksize = be32_to_cpu(rootblock->blocksize);
+ ASFS_SB(sb)->totalblocks = be32_to_cpu(rootblock->totalblocks);
+ ASFS_SB(sb)->rootobjectcontainer = be32_to_cpu(rootblock->rootobjectcontainer);
+ ASFS_SB(sb)->extentbnoderoot = be32_to_cpu(rootblock->extentbnoderoot);
+ ASFS_SB(sb)->objectnoderoot = be32_to_cpu(rootblock->objectnoderoot);
+ ASFS_SB(sb)->flags |= 0xff & rootblock->bits;
+ ASFS_SB(sb)->adminspacecontainer = be32_to_cpu(rootblock->adminspacecontainer);
+ ASFS_SB(sb)->bitmapbase = be32_to_cpu(rootblock->bitmapbase);
+ ASFS_SB(sb)->blocks_inbitmap = (sb->s_blocksize - sizeof(struct fsBitmap))<<3; /* must be a multiple of 32 !! */
+ ASFS_SB(sb)->blocks_bitmap = (ASFS_SB(sb)->totalblocks + ASFS_SB(sb)->blocks_inbitmap - 1) / ASFS_SB(sb)->blocks_inbitmap;
+ ASFS_SB(sb)->block_rovingblockptr = 0;
+ asfs_brelse(bh);
+
+ if (!sb_set_blocksize(sb, sb->s_blocksize)) {
+ printk(KERN_ERR "ASFS: Found Amiga SFS RootBlock on dev %s, but blocksize %ld is not supported!\n", \
+ sb->s_id, sb->s_blocksize);
+ return -EINVAL;
+ }
+
+ bh = sb_bread(sb, 0);
+ if (!bh) {
+ printk(KERN_ERR "ASFS: unable to read superblock\n");
+ goto out;
+ }
+ rootblock = (struct fsRootBlock *)bh->b_data;
+
+ if (asfs_check_block((void *)rootblock, sb->s_blocksize, 0, ASFS_ROOTID)) {
+#ifdef CONFIG_ASFS_RW
+ struct buffer_head *tmpbh;
+ if ((tmpbh = asfs_breadcheck(sb, ASFS_SB(sb)->rootobjectcontainer, ASFS_OBJECTCONTAINER_ID))) {
+ struct fsRootInfo *ri = (struct fsRootInfo *)((u8 *)tmpbh->b_data + sb->s_blocksize - sizeof(struct fsRootInfo));
+ ASFS_SB(sb)->freeblocks = be32_to_cpu(ri->freeblocks);
+ asfs_brelse(tmpbh);
+ } else
+ ASFS_SB(sb)->freeblocks = 0;
+
+ if ((tmpbh = asfs_breadcheck(sb, ASFS_SB(sb)->rootobjectcontainer+2, ASFS_TRANSACTIONFAILURE_ID))) {
+ printk(KERN_NOTICE "VFS: Found Amiga SFS RootBlock on dev %s, but it has unfinished transaction. Mounting read-only.\n", sb->s_id);
+ ASFS_SB(sb)->flags |= ASFS_READONLY;
+ asfs_brelse(tmpbh);
+ }
+
+ if ((tmpbh = asfs_breadcheck(sb, ASFS_SB(sb)->totalblocks-1, ASFS_ROOTID)) == NULL) {
+ printk(KERN_NOTICE "VFS: Found Amiga SFS RootBlock on dev %s, but there is no second RootBlock! Mounting read-only.\n", sb->s_id);
+ ASFS_SB(sb)->flags |= ASFS_READONLY;
+ asfs_brelse(tmpbh);
+ }
+ if (!(ASFS_SB(sb)->flags & ASFS_READONLY))
+ printk(KERN_NOTICE "VFS: Found Amiga SFS RootBlock on dev %s.\n", sb->s_id);
+#else
+ ASFS_SB(sb)->freeblocks = 0;
+ ASFS_SB(sb)->flags |= ASFS_READONLY;
+ printk(KERN_NOTICE "VFS: Found Amiga SFS RootBlock on dev %s.\n", sb->s_id);
+#endif
+ } else {
+ if (!silent)
+ printk(KERN_ERR "VFS: Found Amiga SFS RootBlock on dev %s, but it has checksum error!\n", \
+ sb->s_id);
+ goto out;
+ }
+ } else {
+ if (!silent)
+ printk(KERN_ERR "VFS: Can't find a valid Amiga SFS filesystem on dev %s.\n", \
+ sb->s_id);
+ goto out;
+ }
+
+ asfs_brelse(bh);
+
+ sb->s_magic = ASFS_MAGIC;
+ sb->s_flags |= MS_NODEV | MS_NOSUID;
+ if (ASFS_SB(sb)->flags & ASFS_READONLY)
+ sb->s_flags |= MS_RDONLY;
+ sb->s_op = &asfs_ops;
+ asfs_debug("Case sensitive: %s\n", (ASFS_SB(sb)->flags & ASFS_ROOTBITS_CASESENSITIVE) ? "yes" : "no");
+
+ if (ASFS_SB(sb)->codepage[0] != '\0' && strcmp(ASFS_SB(sb)->codepage, "none") != 0) {
+ ASFS_SB(sb)->nls_disk = load_nls(ASFS_SB(sb)->codepage);
+ if (!ASFS_SB(sb)->nls_disk) {
+ printk(KERN_ERR "ASFS: codepage %s not found\n", ASFS_SB(sb)->codepage);
+ return -EINVAL;
+ }
+ ASFS_SB(sb)->nls_io = load_nls(ASFS_SB(sb)->iocharset);
+ if (!ASFS_SB(sb)->nls_io) {
+ printk(KERN_ERR "ASFS: IO charset %s not found\n", ASFS_SB(sb)->iocharset);
+ goto out2;
+ }
+ } else {
+ ASFS_SB(sb)->nls_io = NULL;
+ ASFS_SB(sb)->nls_disk = NULL;
+ }
+
+ if ((rootinode = asfs_get_root_inode(sb))) {
+ if ((sb->s_root = d_alloc_root(rootinode))) {
+ sb->s_root->d_op = &asfs_dentry_operations;
+ return 0;
+ }
+ iput(rootinode);
+ }
+ unload_nls(ASFS_SB(sb)->nls_io);
+out2:
+ unload_nls(ASFS_SB(sb)->nls_disk);
+ return -EINVAL;
+
+out:
+ asfs_brelse(bh);
+ return -EINVAL;
+
+}
+
+#ifdef CONFIG_ASFS_RW
+static int asfs_remount(struct super_block *sb, int *flags, char *data)
+{
+ asfs_debug("ASFS: remount (flags=0x%x, opts=\"%s\")\n",*flags,data);
+
+ if (!asfs_parse_options(data,sb))
+ return -EINVAL;
+
+ if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
+ return 0;
+
+ if (*flags & MS_RDONLY) {
+ sb->s_flags |= MS_RDONLY;
+ } else if (!(ASFS_SB(sb)->flags & ASFS_READONLY)) {
+ sb->s_flags &= ~MS_RDONLY;
+ } else {
+ printk("VFS: Can't remount Amiga SFS on dev %s read/write because of errors.", sb->s_id);
+ return -EINVAL;
+ }
+ return 0;
+}
+#endif
+
+static void asfs_put_super(struct super_block *sb)
+{
+ struct asfs_sb_info *sbi = ASFS_SB(sb);
+
+ if (ASFS_SB(sb)->prefix)
+ kfree(ASFS_SB(sb)->prefix);
+ if (ASFS_SB(sb)->root_volume)
+ kfree(ASFS_SB(sb)->root_volume);
+ if (ASFS_SB(sb)->nls_disk)
+ unload_nls(ASFS_SB(sb)->nls_disk);
+ if (ASFS_SB(sb)->nls_io)
+ unload_nls(ASFS_SB(sb)->nls_io);
+ if (ASFS_SB(sb)->iocharset != asfs_default_iocharset)
+ kfree(ASFS_SB(sb)->iocharset);
+ if (ASFS_SB(sb)->codepage != asfs_default_codepage)
+ kfree(ASFS_SB(sb)->codepage);
+
+ kfree(sbi);
+ sb->s_fs_info = NULL;
+ return;
+}
+
+/* That's simple too. */
+static int asfs_statfs(struct dentry *dentry, struct kstatfs *buf)
+{
+ struct super_block *sb = dentry->d_sb;
+
+ buf->f_type = ASFS_MAGIC;
+ buf->f_bsize = sb->s_blocksize;
+ buf->f_bfree = buf->f_bavail = ASFS_SB(sb)->freeblocks;
+ buf->f_blocks = ASFS_SB(sb)->totalblocks;
+ buf->f_namelen = ASFS_MAXFN;
+ return 0;
+}
+
+/* --- new in 2.6.x --- */
+static struct kmem_cache * asfs_inode_cachep;
+static struct inode *asfs_alloc_inode(struct super_block *sb)
+{
+ struct asfs_inode_info *ei;
+ ei = (struct asfs_inode_info *)kmem_cache_alloc(asfs_inode_cachep, GFP_KERNEL);
+ if (!ei)
+ return NULL;
+ return &ei->vfs_inode;
+}
+
+static void asfs_destroy_inode(struct inode *inode)
+{
+ kmem_cache_free(asfs_inode_cachep, ASFS_I(inode));
+}
+static void init_once(struct kmem_cache * cachep, void *foo)
+{
+ struct asfs_inode_info *ei = (struct asfs_inode_info *) foo;
+
+ inode_init_once(&ei->vfs_inode);
+}
+
+static int init_inodecache(void)
+{
+ asfs_inode_cachep = kmem_cache_create("asfs_inode_cache",
+ sizeof(struct asfs_inode_info),
+ 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT,
+ init_once);
+ if (asfs_inode_cachep == NULL)
+ return -ENOMEM;
+ return 0;
+}
+
+static void destroy_inodecache(void)
+{
+ kmem_cache_destroy(asfs_inode_cachep);
+}
+
+static int asfs_get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data, struct vfsmount *mnt)
+{
+ return get_sb_bdev(fs_type, flags, dev_name, data, asfs_fill_super,
+ mnt);
+}
+
+static struct file_system_type asfs_fs_type = {
+ .owner = THIS_MODULE,
+ .name = "asfs",
+ .get_sb = asfs_get_sb,
+ .kill_sb = kill_block_super,
+ .fs_flags = FS_REQUIRES_DEV,
+};
+
+static int __init init_asfs_fs(void)
+{
+ int err = init_inodecache();
+ if (err)
+ goto out1;
+ err = register_filesystem(&asfs_fs_type);
+ if (err)
+ goto out;
+ return 0;
+out:
+ destroy_inodecache();
+out1:
+ return err;
+}
+
+static void __exit exit_asfs_fs(void)
+{
+ unregister_filesystem(&asfs_fs_type);
+ destroy_inodecache();
+}
+
+/* Yes, works even as a module... :) */
+
+#ifdef CONFIG_ASFS_RW
+MODULE_DESCRIPTION("Amiga Smart File System (read/write) support for Linux kernel 2.6.x v" ASFS_VERSION);
+#else
+MODULE_DESCRIPTION("Amiga Smart File System (read-only) support for Linux kernel 2.6.x v" ASFS_VERSION);
+#endif
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Marek Szyprowski <marek@xxxxxxxx>");
+
+module_init(init_asfs_fs)
+module_exit(exit_asfs_fs)
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
