Hi,
This patch add support for the AtheOS file system. With this, i can
boot Syllable using the following commands:
multiboot /system/kernel.so root=/dev/disk/ata/hda/0 uspace_end=0xf7ffffff
module /system/config/kernel.cfg
module /system/drivers/dev/bus/acpi
module /system/drivers/dev/bus/pci
module /system/drivers/dev/bus/ata
module /system/drivers/dev/hcd/ata_pci
module /system/drivers/fs/afs
2008-03-25 Bean <[EMAIL PROTECTED]>
* conf/common.rmk (pkgdata_MODULES): Add afs.mod.
(grub_probe_SOURCES): Add fs/afs.c.
(grub_fstest_SOURCES): Likewise.
(afs_mod_SOURCES): New variable.
(afs_mod_CFLAGS): Likewise.
(afs_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (grub_setup_SOURCES): Add fs/afs.c.
(grub_emu_SOURCES): Likewise.
* conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-linuxbios.rmk (grub_emu_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* fs/afs.c: New file.
--
Bean
diff --git a/conf/common.rmk b/conf/common.rmk
index d99e053..6e2d7aa 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -11,7 +11,7 @@ grub_probe_SOURCES = util/grub-probe.c \
fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
- fs/ufs.c fs/xfs.c \
+ fs/ufs.c fs/xfs.c fs/afs.c \
\
partmap/pc.c partmap/apple.c partmap/gpt.c \
kern/fs.c kern/env.c fs/fshelp.c \
@@ -31,7 +31,7 @@ grub_fstest_SOURCES = util/grub-fstest.c util/hostfs.c
util/misc.c \
fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
- fs/ufs.c fs/xfs.c \
+ fs/ufs.c fs/xfs.c fs/afs.c \
\
kern/partition.c partmap/pc.c partmap/apple.c partmap/gpt.c \
kern/fs.c kern/env.c fs/fshelp.c disk/lvm.c disk/raid.c \
@@ -131,7 +131,8 @@ update-grub_DATA += util/grub.d/README
# Filing systems.
pkglib_MODULES += fshelp.mod fat.mod ufs.mod ext2.mod ntfs.mod \
ntfscomp.mod minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod \
- affs.mod sfs.mod hfsplus.mod reiserfs.mod cpio.mod udf.mod
+ affs.mod sfs.mod hfsplus.mod reiserfs.mod cpio.mod udf.mod \
+ afs.mod
# For fshelp.mod.
fshelp_mod_SOURCES = fs/fshelp.c
@@ -218,6 +219,11 @@ udf_mod_SOURCES = fs/udf.c
udf_mod_CFLAGS = $(COMMON_CFLAGS)
udf_mod_LDFLAGS = $(COMMON_LDFLAGS)
+# For afs.mod.
+afs_mod_SOURCES = fs/afs.c
+afs_mod_CFLAGS = $(COMMON_CFLAGS)
+afs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
# Partition maps.
pkglib_MODULES += amiga.mod apple.mod pc.mod sun.mod acorn.mod gpt.mod
diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index 1a18aff..cc60d3d 100644
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -46,7 +46,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c
commands/cmp.c \
fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
- fs/ufs.c fs/xfs.c \
+ fs/ufs.c fs/xfs.c fs/afs.c \
\
io/gzio.c \
kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c \
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 80d2037..5f37eb5 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -71,7 +71,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c
commands/cmp.c \
fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
- fs/ufs.c fs/xfs.c \
+ fs/ufs.c fs/xfs.c fs/afs.c \
\
fs/fshelp.c \
io/gzio.c \
diff --git a/conf/i386-linuxbios.rmk b/conf/i386-linuxbios.rmk
index 3eafe4d..1721a1d 100644
--- a/conf/i386-linuxbios.rmk
+++ b/conf/i386-linuxbios.rmk
@@ -69,7 +69,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c
commands/cmp.c \
fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
- fs/ufs.c fs/xfs.c \
+ fs/ufs.c fs/xfs.c fs/afs.c \
\
fs/fshelp.c \
io/gzio.c \
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 316b05f..37a9f5b 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -90,7 +90,7 @@ grub_setup_SOURCES = util/i386/pc/grub-setup.c
util/biosdisk.c \
fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
- fs/ufs.c fs/xfs.c \
+ fs/ufs.c fs/xfs.c fs/afs.c \
\
partmap/pc.c partmap/gpt.c \
\
@@ -128,7 +128,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c
commands/cmp.c \
fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
- fs/ufs.c fs/xfs.c \
+ fs/ufs.c fs/xfs.c fs/afs.c \
\
util/console.c util/hostfs.c util/grub-emu.c util/misc.c \
util/biosdisk.c util/getroot.c \
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 6432754..8c8aa55 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -57,7 +57,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c
commands/cmp.c \
fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c \
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
- fs/ufs.c fs/xfs.c \
+ fs/ufs.c fs/xfs.c fs/afs.c \
\
io/gzio.c \
kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c \
diff --git a/fs/afs.c b/fs/afs.c
new file mode 100755
index 0000000..7c61671
--- /dev/null
+++ b/fs/afs.c
@@ -0,0 +1,636 @@
+/* afs.c - The native AtheOS file-system. */
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2008 Free Software Foundation, Inc.
+ *
+ * GRUB 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GRUB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/err.h>
+#include <grub/file.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/disk.h>
+#include <grub/dl.h>
+#include <grub/types.h>
+#include <grub/fshelp.h>
+
+#define GRUB_AFS_DIRECT_BLOCK_COUNT 12
+#define GRUB_AFS_BLOCKS_PER_DI_RUN 4
+
+#define GRUB_AFS_SBLOCK_MAGIC1 0x41465331 /* AFS1 */
+#define GRUB_AFS_SBLOCK_MAGIC2 0xdd121031
+#define GRUB_AFS_SBLOCK_MAGIC3 0x15b6830e
+
+#define GRUB_AFS_INODE_MAGIC 0x64358428
+
+#define GRUB_AFS_BTREE_MAGIC 0x65768995
+
+#define GRUB_AFS_BNODE_SIZE 1024
+
+#define GRUB_AFS_S_IFMT 00170000
+#define GRUB_AFS_S_IFLNK 0120000
+
+#define GRUB_AFS_S_IFREG 0100000
+#define GRUB_AFS_S_IFDIR 0040000
+#define GRUB_AFS_S_IFIFO 0010000
+
+#define GRUB_AFS_NULL_VAL ((grub_afs_bvalue_t)-1)
+
+#define U16(sb, u) (((sb)->byte_order == GRUB_AFS_BO_LITTLE_ENDIAN) ? \
+ grub_le_to_cpu16 (u) : grub_be_to_cpu16 (u))
+
+#define U32(sb, u) (((sb)->byte_order == GRUB_AFS_BO_LITTLE_ENDIAN) ? \
+ grub_le_to_cpu32 (u) : grub_be_to_cpu32 (u))
+
+#define U64(sb, u) (((sb)->byte_order == GRUB_AFS_BO_LITTLE_ENDIAN) ? \
+ grub_le_to_cpu64 (u) : grub_be_to_cpu64 (u))
+
+#define B_KEY_INDEX_OFFSET(node) ((grub_uint16_t *) \
+ ((char *) (node) + \
+ sizeof (struct grub_afs_bnode) + \
+ ((node->key_size + 3) & ~3)))
+
+#define B_KEY_VALUE_OFFSET(node) ((grub_afs_bvalue_t *) \
+ ((char *) B_KEY_INDEX_OFFSET (node) + \
+ node->key_count * 2))
+
+enum
+{
+ GRUB_AFS_BO_LITTLE_ENDIAN,
+ GRUB_AFS_BO_BIG_ENDIAN
+};
+
+typedef grub_uint64_t grub_afs_off_t;
+typedef grub_uint64_t grub_afs_bigtime;
+typedef grub_uint64_t grub_afs_bvalue_t;
+
+struct grub_afs_blockrun
+{
+ grub_uint32_t group;
+ grub_uint16_t start;
+ grub_uint16_t len;
+};
+
+struct grub_afs_datastream
+{
+ struct grub_afs_blockrun direct[GRUB_AFS_DIRECT_BLOCK_COUNT];
+ grub_afs_off_t max_direct_range;
+ struct grub_afs_blockrun indirect;
+ grub_afs_off_t max_indirect_range;
+ struct grub_afs_blockrun double_indirect;
+ grub_afs_off_t max_double_indirect_range;
+ grub_afs_off_t size;
+};
+
+struct grub_afs_bnode
+{
+ grub_afs_bvalue_t left;
+ grub_afs_bvalue_t right;
+ grub_afs_bvalue_t overflow;
+ grub_uint32_t key_count;
+ grub_uint32_t key_size;
+ char key_data[0];
+};
+
+struct grub_afs_btree
+{
+ grub_uint32_t magic;
+ grub_afs_bvalue_t root;
+ grub_uint32_t tree_depth;
+ grub_afs_bvalue_t last_node;
+ grub_afs_bvalue_t first_free;
+} ;
+
+struct grub_afs_sblock
+{
+ grub_uint8_t name[32];
+ grub_uint32_t magic1;
+ grub_uint32_t byte_order;
+ grub_uint32_t block_size;
+ grub_uint32_t block_shift;
+ grub_afs_off_t num_blocks;
+ grub_afs_off_t used_blocks;
+ grub_uint32_t inode_size;
+ grub_uint32_t magic2;
+ grub_uint32_t block_per_group; // Number of blocks per
allocation group (Max 65536)
+ grub_uint32_t alloc_group_shift; // Number of bits to shift a
group number to get a byte address.
+ grub_uint32_t alloc_group_count;
+ grub_uint32_t flags;
+ struct grub_afs_blockrun log_block;
+ grub_afs_off_t log_start;
+ grub_uint32_t valid_log_blocks;
+ grub_uint32_t log_size;
+ grub_uint32_t magic3;
+ struct grub_afs_blockrun root_dir; // Root dir inode.
+ struct grub_afs_blockrun deleted_files; // Directory containing files
scheduled for deletion.
+ struct grub_afs_blockrun index_dir; // Directory of index files.
+ grub_uint32_t boot_loader_size;
+ grub_uint32_t pad[7];
+};
+
+struct grub_afs_inode
+{
+ grub_uint32_t magic1;
+ struct grub_afs_blockrun inode_num;
+ grub_uint32_t uid;
+ grub_uint32_t gid;
+ grub_uint32_t mode;
+ grub_uint32_t flags;
+ grub_uint32_t link_count;
+ grub_afs_bigtime create_time;
+ grub_afs_bigtime modified_time;
+ struct grub_afs_blockrun parent;
+ struct grub_afs_blockrun attrib_dir;
+ grub_uint32_t index_type; /* Key data-key only used for index
files */
+ grub_uint32_t inode_size;
+ void* vnode;
+ struct grub_afs_datastream stream;
+ grub_uint32_t pad[4];
+ grub_uint32_t small_data[1];
+};
+
+struct grub_fshelp_node
+{
+ struct grub_afs_data *data;
+ struct grub_afs_inode inode;
+};
+
+struct grub_afs_data
+{
+ grub_disk_t disk;
+ struct grub_afs_sblock sblock;
+ struct grub_afs_inode *inode;
+ struct grub_fshelp_node diropen;
+};
+
+#ifndef GRUB_UTIL
+static grub_dl_t my_mod;
+#endif
+
+static grub_afs_off_t
+grub_afs_run_to_num (struct grub_afs_sblock *sb,
+ struct grub_afs_blockrun *run)
+{
+ return ((grub_afs_off_t) U32 (sb, run->group) * sb->block_per_group +
+ U16 (sb, run->start));
+}
+
+static grub_err_t
+grub_afs_read_inode (struct grub_afs_data *data,
+ grub_uint32_t ino, struct grub_afs_inode *inode)
+{
+ return grub_disk_read (data->disk,
+ ino *
+ (data->sblock.block_size >> GRUB_DISK_SECTOR_BITS),
+ 0, sizeof (struct grub_afs_inode),
+ (char *) inode);
+}
+
+static int
+grub_afs_read_block (grub_fshelp_node_t node, int fileblock)
+{
+ struct grub_afs_sblock *sb = &node->data->sblock;
+ struct grub_afs_datastream *ds = &node->inode.stream;
+
+ if ((grub_uint32_t) fileblock < U64 (sb, ds->max_direct_range))
+ {
+ int i;
+
+ for (i = 0; i < GRUB_AFS_DIRECT_BLOCK_COUNT; i++)
+ {
+ if (fileblock < U16 (sb, ds->direct[i].len))
+ return grub_afs_run_to_num (sb, &ds->direct[i]) + fileblock;
+ fileblock -= U16 (sb, ds->direct[i].len);
+ }
+ }
+ else if ((grub_uint32_t) fileblock < U64 (sb, ds->max_indirect_range))
+ {
+ int ptrs_per_blk = sb->block_size / sizeof (struct grub_afs_blockrun);
+ struct grub_afs_blockrun indir[ptrs_per_blk];
+ grub_afs_off_t blk = grub_afs_run_to_num (sb, &ds->indirect);
+ int i;
+
+ fileblock -= U64 (sb, ds->max_direct_range);
+ for (i = 0; i < ds->indirect.len; i++, blk++)
+ {
+ int j;
+
+ if (grub_disk_read (node->data->disk,
+ blk * (sb->block_size >> GRUB_DISK_SECTOR_BITS),
+ 0, sizeof (indir),
+ (char *) indir))
+ return 0;
+
+ for (j = 0; j < ptrs_per_blk; j++)
+ {
+ if (fileblock < U16 (sb, indir[j].len))
+ return grub_afs_run_to_num (sb, &indir[j]) + fileblock;
+
+ fileblock -= U16 (sb, indir[j].len);
+ }
+ }
+ }
+ else
+ {
+ int ptrs_per_blk = sb->block_size / sizeof (struct grub_afs_blockrun);
+ struct grub_afs_blockrun indir[ptrs_per_blk];
+
+ /* ([idblk][idptr]) ([dblk][dptr]) [blk] */
+ int cur_pos = fileblock - U64 (sb, ds->max_indirect_range);
+
+ int dptr_size = GRUB_AFS_BLOCKS_PER_DI_RUN;
+ int dblk_size = dptr_size * ptrs_per_blk;
+ int idptr_size = dblk_size * GRUB_AFS_BLOCKS_PER_DI_RUN;
+ int idblk_size = idptr_size * ptrs_per_blk;
+
+ int off = cur_pos % GRUB_AFS_BLOCKS_PER_DI_RUN;
+ int dptr = (cur_pos / dptr_size) % ptrs_per_blk;
+ int dblk = (cur_pos / dblk_size) % GRUB_AFS_BLOCKS_PER_DI_RUN;
+ int idptr = (cur_pos / idptr_size) % ptrs_per_blk;
+ int idblk = (cur_pos / idblk_size);
+
+ if (grub_disk_read (node->data->disk,
+ (grub_afs_run_to_num (sb, &ds->double_indirect)
+ + idblk) *
+ (sb->block_size >> GRUB_DISK_SECTOR_BITS),
+ 0, sizeof (indir),
+ (char *) indir))
+ return 0;
+
+ if (grub_disk_read (node->data->disk,
+ (grub_afs_run_to_num (sb, &indir[idptr]) + dblk) *
+ (sb->block_size >> GRUB_DISK_SECTOR_BITS),
+ 0, sizeof (indir),
+ (char *) indir))
+ return 0;
+
+ return grub_afs_run_to_num (sb, &indir[dptr]) + off;
+ }
+
+ return 0;
+}
+
+static grub_ssize_t
+grub_afs_read_file (grub_fshelp_node_t node,
+ void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t
sector,
+ unsigned offset,
unsigned length),
+ int pos, grub_size_t len, char *buf)
+{
+ return grub_fshelp_read_file (node->data->disk, node, read_hook,
+ pos, len, buf, grub_afs_read_block,
+ U64 (&node->data->sblock,
+ node->inode.stream.size),
+ node->data->sblock.block_shift
+ - GRUB_DISK_SECTOR_BITS);
+}
+
+static int
+grub_afs_iterate_dir (grub_fshelp_node_t dir,
+ int NESTED_FUNC_ATTR
+ (*hook) (const char *filename,
+ enum grub_fshelp_filetype filetype,
+ grub_fshelp_node_t node))
+{
+ struct grub_afs_btree head;
+ char node_data [GRUB_AFS_BNODE_SIZE];
+ struct grub_afs_bnode *node = (struct grub_afs_bnode *) node_data;
+ struct grub_afs_sblock *sb = &dir->data->sblock;
+ int i;
+
+ if ((! dir->inode.stream.size) ||
+ ((U32 (sb, dir->inode.mode) & GRUB_AFS_S_IFMT) != GRUB_AFS_S_IFDIR))
+ return 0;
+
+ grub_afs_read_file (dir, 0, 0, sizeof (head), (char *) &head);
+ if (grub_errno)
+ return 0;
+
+ grub_afs_read_file (dir, 0, U64 (sb, head.root),
+ GRUB_AFS_BNODE_SIZE, (char *) node);
+ if (grub_errno)
+ return 0;
+
+ for (i = 0; i < (int) U32 (sb, head.tree_depth) - 1; i++)
+ {
+ grub_afs_bvalue_t blk;
+
+ blk = U64(sb, B_KEY_VALUE_OFFSET (node) [0]);
+ grub_afs_read_file (dir, 0, blk, GRUB_AFS_BNODE_SIZE, (char *) node);
+ if (grub_errno)
+ return 0;
+ }
+
+ if (node->key_count)
+ {
+ grub_uint32_t cur_key = 0;
+
+ while (1)
+ {
+ int key_start, key_size;
+ grub_uint16_t *index;
+
+ index = B_KEY_INDEX_OFFSET (node);
+
+ key_start = U16 (sb, (cur_key > 0) ? index[cur_key - 1] : 0);
+ key_size = U16 (sb, index[cur_key]) - key_start;
+ if (key_size)
+ {
+ char filename [key_size + 1];
+ struct grub_fshelp_node *fdiro;
+ int mode, type;
+
+ fdiro = grub_malloc (sizeof (struct grub_fshelp_node));
+ if (! fdiro)
+ return 0;
+
+ fdiro->data = dir->data;
+ if (grub_afs_read_inode (dir->data,
+ U64 (sb, B_KEY_VALUE_OFFSET (node)
[cur_key]),
+ &fdiro->inode))
+ return 0;
+
+ grub_memcpy (filename, &node->key_data[key_start], key_size);
+ filename [key_size] = 0;
+
+ mode = (U32 (sb, fdiro->inode.mode) & GRUB_AFS_S_IFMT);
+ if (mode == GRUB_AFS_S_IFDIR)
+ type = GRUB_FSHELP_DIR;
+ else if (mode == GRUB_AFS_S_IFREG)
+ type = GRUB_FSHELP_REG;
+ else
+ type = GRUB_FSHELP_UNKNOWN;
+
+ if (hook (filename, type, fdiro))
+ return 1;
+ }
+
+ cur_key++;
+ if (cur_key >= U32 (sb, node->key_count))
+ {
+ if (node->right == GRUB_AFS_NULL_VAL)
+ break;
+
+ grub_afs_read_file (dir, 0, U64 (sb, node->right),
+ GRUB_AFS_BNODE_SIZE, (char *) node);
+ if (grub_errno)
+ return 0;
+
+ cur_key = 0;
+ }
+ }
+ }
+
+ return 0;
+}
+
+static int
+grub_afs_validate_sblock (struct grub_afs_sblock *sb)
+{
+ if (grub_le_to_cpu32 (sb->magic1) == GRUB_AFS_SBLOCK_MAGIC1)
+ {
+ if (grub_le_to_cpu32 (sb->byte_order) != GRUB_AFS_BO_LITTLE_ENDIAN)
+ return 0;
+
+ sb->byte_order = GRUB_AFS_BO_LITTLE_ENDIAN;
+ sb->magic2 = grub_le_to_cpu32 (sb->magic2);
+ sb->magic3 = grub_le_to_cpu32 (sb->magic3);
+ sb->block_shift = grub_le_to_cpu32 (sb->block_shift);
+ sb->block_size = grub_le_to_cpu32 (sb->block_size);
+ sb->used_blocks = grub_le_to_cpu64 (sb->used_blocks);
+ sb->num_blocks = grub_le_to_cpu64 (sb->num_blocks);
+ sb->inode_size = grub_le_to_cpu32 (sb->inode_size);
+ sb->alloc_group_count = grub_le_to_cpu32 (sb->alloc_group_count);
+ sb->alloc_group_shift = grub_le_to_cpu32 (sb->alloc_group_shift);
+ sb->block_per_group = grub_le_to_cpu32 (sb->block_per_group);
+ sb->alloc_group_count = grub_le_to_cpu32 (sb->alloc_group_count);
+ sb->log_size = grub_le_to_cpu32 (sb->log_size);
+ }
+ else if (grub_be_to_cpu32 (sb->magic1) == GRUB_AFS_SBLOCK_MAGIC1)
+ {
+ if (grub_be_to_cpu32 (sb->byte_order) != GRUB_AFS_BO_BIG_ENDIAN)
+ return 0;
+
+ sb->byte_order = GRUB_AFS_BO_BIG_ENDIAN;
+ sb->magic2 = grub_be_to_cpu32 (sb->magic2);
+ sb->magic3 = grub_be_to_cpu32 (sb->magic3);
+ sb->block_shift = grub_be_to_cpu32 (sb->block_shift);
+ sb->block_size = grub_be_to_cpu32 (sb->block_size);
+ sb->used_blocks = grub_be_to_cpu64 (sb->used_blocks);
+ sb->num_blocks = grub_be_to_cpu64 (sb->num_blocks);
+ sb->inode_size = grub_be_to_cpu32 (sb->inode_size);
+ sb->alloc_group_count = grub_be_to_cpu32 (sb->alloc_group_count);
+ sb->alloc_group_shift = grub_be_to_cpu32 (sb->alloc_group_shift);
+ sb->block_per_group = grub_be_to_cpu32 (sb->block_per_group);
+ sb->alloc_group_count = grub_be_to_cpu32 (sb->alloc_group_count);
+ sb->log_size = grub_be_to_cpu32 (sb->log_size);
+ }
+ else
+ return 0;
+
+ if ((sb->magic2 != GRUB_AFS_SBLOCK_MAGIC2) ||
+ (sb->magic3 != GRUB_AFS_SBLOCK_MAGIC3))
+ return 0;
+
+ if (((grub_uint32_t) (1 << sb->block_shift) != sb->block_size) ||
+ (sb->used_blocks > sb->num_blocks ) ||
+ (sb->inode_size != sb->block_size) ||
+ (0 == sb->block_size) ||
+ ((grub_uint32_t) (1 << sb->alloc_group_shift) !=
+ sb->block_per_group * sb->block_size) ||
+ (sb->alloc_group_count * sb->block_per_group < sb->num_blocks) ||
+ (U16 (sb, sb->log_block.len) != sb->log_size) ||
+ (U32 (sb, sb->valid_log_blocks) > sb->log_size))
+ return 0;
+
+ return 1;
+}
+
+static struct grub_afs_data *
+grub_afs_mount (grub_disk_t disk)
+{
+ struct grub_afs_data *data = 0;
+
+ data = grub_malloc (sizeof (struct grub_afs_data));
+ if (!data)
+ return 0;
+
+ /* Read the superblock. */
+ if (grub_disk_read (disk, 1 * 2, 0, sizeof (struct grub_afs_sblock),
+ (char *) &data->sblock))
+ goto fail;
+
+ if (! grub_afs_validate_sblock (&data->sblock))
+ {
+ if (grub_disk_read (disk, 1 * 2, 0, sizeof (struct grub_afs_sblock),
+ (char *) &data->sblock))
+ goto fail;
+
+ if (! grub_afs_validate_sblock (&data->sblock))
+ goto fail;
+ }
+
+ data->diropen.data = data;
+ data->inode = &data->diropen.inode;
+ data->disk = disk;
+
+ if (grub_afs_read_inode (data,
+ grub_afs_run_to_num (&data->sblock,
+ &data->sblock.root_dir),
+ data->inode))
+ goto fail;
+
+ return data;
+
+fail:
+ grub_error (GRUB_ERR_BAD_FS, "not an afs filesystem");
+ grub_free (data);
+ return 0;
+}
+
+static grub_err_t
+grub_afs_open (struct grub_file *file, const char *name)
+{
+ struct grub_afs_data *data;
+ struct grub_fshelp_node *fdiro = 0;
+
+#ifndef GRUB_UTIL
+ grub_dl_ref (my_mod);
+#endif
+
+ data = grub_afs_mount (file->device->disk);
+ if (! data)
+ goto fail;
+
+ grub_fshelp_find_file (name, &data->diropen, &fdiro, grub_afs_iterate_dir,
+ 0, GRUB_FSHELP_REG);
+ if (grub_errno)
+ goto fail;
+
+ grub_memcpy (data->inode, &fdiro->inode, sizeof (struct grub_afs_inode));
+ grub_free (fdiro);
+
+ file->size = U64 (&data->sblock, data->inode->stream.size);
+ file->data = data;
+ file->offset = 0;
+
+ return 0;
+
+fail:
+ if (fdiro != &data->diropen)
+ grub_free (fdiro);
+ grub_free (data);
+
+#ifndef GRUB_UTIL
+ grub_dl_unref (my_mod);
+#endif
+
+ return grub_errno;
+}
+
+static grub_ssize_t
+grub_afs_read (grub_file_t file, char *buf, grub_size_t len)
+{
+ struct grub_afs_data *data = (struct grub_afs_data *) file->data;
+
+ return grub_afs_read_file (&data->diropen, file->read_hook,
+ file->offset, len, buf);
+}
+
+static grub_err_t
+grub_afs_close (grub_file_t file)
+{
+ grub_free (file->data);
+
+#ifndef GRUB_UTIL
+ grub_dl_unref (my_mod);
+#endif
+
+ return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_afs_dir (grub_device_t device, const char *path,
+ int (*hook) (const char *filename, int dir))
+{
+ struct grub_afs_data *data = 0;;
+ struct grub_fshelp_node *fdiro = 0;
+
+ auto int NESTED_FUNC_ATTR iterate (const char *filename,
+ enum grub_fshelp_filetype filetype,
+ grub_fshelp_node_t node);
+
+ int NESTED_FUNC_ATTR iterate (const char *filename,
+ enum grub_fshelp_filetype filetype,
+ grub_fshelp_node_t node)
+ {
+ grub_free (node);
+
+ if (filetype == GRUB_FSHELP_DIR)
+ return hook (filename, 1);
+ else
+ return hook (filename, 0);
+
+ return 0;
+ }
+
+#ifndef GRUB_UTIL
+ grub_dl_ref (my_mod);
+#endif
+
+ data = grub_afs_mount (device->disk);
+ if (! data)
+ goto fail;
+
+ grub_fshelp_find_file (path, &data->diropen, &fdiro, grub_afs_iterate_dir,
+ 0, GRUB_FSHELP_DIR);
+ if (grub_errno)
+ goto fail;
+
+ grub_afs_iterate_dir (fdiro, iterate);
+
+ fail:
+ if (fdiro != &data->diropen)
+ grub_free (fdiro);
+ grub_free (data);
+
+#ifndef GRUB_UTIL
+ grub_dl_unref (my_mod);
+#endif
+
+ return grub_errno;
+}
+
+static struct grub_fs grub_afs_fs = {
+ .name = "afs",
+ .dir = grub_afs_dir,
+ .open = grub_afs_open,
+ .read = grub_afs_read,
+ .close = grub_afs_close,
+ .label = 0,
+ .next = 0
+};
+
+GRUB_MOD_INIT (afs)
+{
+ grub_fs_register (&grub_afs_fs);
+#ifndef GRUB_UTIL
+ my_mod = mod;
+#endif
+}
+
+GRUB_MOD_FINI (afs)
+{
+ grub_fs_unregister (&grub_afs_fs);
+}
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
