namei.c: - Support symlinks correctly.

inode.c: - Formatting, minor change to start supporting indirect extents.

dir.c:   - Prevent access to an indirect directory from hosing the system.

*.h:     - Add forgotten include files.

3 files changed, 247 insertions, 0 deletions

diff --git a/include/linux/efs_fs.h b/include/linux/efs_fs.h
new file mode 100644
index 000000000..93fcb272a
--- /dev/null
+++ b/include/linux/efs_fs.h
@@ -0,0 +1,191 @@
+/*
+ *   linux/include/linux/efs_fs.h
+ *
+ * Copyright (C) 1997
+ * Mike Shaver (shaver@neon.ingenia.ca)
+ *
+ * Based on work Copyright (C) 1995, 1996 Christian Vogelgsang.
+ *
+ * $Id$
+ */
+
+#ifndef __LINUX_EFS_FS_H
+#define __LINUX_EFS_FS_H
+
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/time.h>
+#include <linux/stat.h>
+#include <linux/fs.h>
+
+/* SuperMagic: need a unique Identifier for EFS */
+#define EFS_SUPER_MAGIC	    0x280273
+#define EFS_ROOT_INODE	    2
+#define EFS_BLK_SUPER	    1
+
+#define EFS_BLOCK_SIZE	    512
+#define EFS_BLOCK_SIZE_BITS 9
+
+/* EFS Magic IDs */
+#define EFS_MAGIC1	    0x72959
+#define EFS_MAGIC2	    0x7295a
+
+/* Offsets in VolumeDescriptor */
+#define EFS_VD_FS_START     0x190  /* First FS block */
+#define EFS_VD_ENTRYFIRST   0x48   /* Begin of Entry list */
+#define EFS_VD_ENTRYPOS     8      /* offset for the entry position */
+#define EFS_VD_ENTRYLEN     12     /* offset for the entry length */
+#define EFS_VD_ENTRYSIZE    16     /* length of an entry */
+
+/* Offsets in Superblock */
+#define EFS_SB_TOTAL	    0	   /* Number of Blocks used for filesystem */
+#define EFS_SB_FIRST	    4	   /* BB of Begin First Cylinder Group */
+#define EFS_SB_GROUP	    8	   /* BBs per Group */
+#define EFS_SB_INODE	    12	   /* BBs used for Inodes at  begin of group */
+#define EFS_SB_TOGRP	    18	   /* Number of Groups in Filesystem */
+#define EFS_SB_MAGIC	    28
+
+struct efs_super_block {
+	__u32	s_size;
+	__u32	s_firstcg;
+	__u32	s_cgfsize;
+	__u16	s_cgisize;
+	__u16	s_sectors;
+	__u16	s_heads;
+	__u16	s_ncg;
+	__u16	s_dirty;
+	__u32	s_time;
+	__u32	s_magic;
+	char	s_fname[6];
+	char	s_fpack[6];
+	__u32	s_bmsize;
+	__u32	s_tfree;
+	__u32	s_tinode;
+	__u32	s_bmblock;
+	__u32	s_replsb;
+	__u32	s_lastialloc;
+	char	s_spare[20];	/* Must be zero */
+	__u32	s_checksum;
+};
+
+#ifdef DEBUG
+void efs_dump_super(struct efs_super_block *);
+#endif
+
+#define EFS_MAX_EXTENTS          12
+
+/* odev is used by "pre-extended-dev_t" IRIX EFS implementations, and
+   later ones use odev and ndev together */
+
+struct efs_devs {
+	__u16	odev;
+	__u32	ndev;
+};
+
+union efs_extent {
+	struct {
+		__u32	ex_magic:4,	/* must be zero */
+			ex_bn:24;
+		__u32	ex_length:8,
+			ex_offset;
+	} ex_ex;
+	__u32	ex_bytes[2];
+};
+
+struct efs_disk_inode {
+	__u16	di_mode;
+	__u16	di_nlink;
+	__u16	di_uid;
+	__u16	di_gid;
+	__u32	di_size;
+	__u32	di_atime;
+	__u32	di_mtime;
+	__u32	di_ctime;
+	__u32	di_gen;
+	__u16	di_numextents;
+	__u8	di_version;
+	__u8	di_spare;
+	union di_addr {
+		union efs_extent	di_extents[EFS_MAX_EXTENTS];
+		struct efs_devs		di_dev;
+	} di_u;
+};
+
+/* Offsets in DirBlock */
+#define EFS_DB_ENTRIES      3
+#define EFS_DB_FIRST        4
+#define EFS_DIRBLK_MAGIC	0xBEEF
+#define EFS_DIRBLK_HEADERSIZE	4
+#define EFS_DIRBLK_SIZE		EFS_BLOCK_SIZE
+
+struct efs_dirblk {
+	__u16	db_magic;	/* 0xBEEF */
+	__u8	db_firstused;
+	__u8	db_slots;
+	__u8	db_space[EFS_DIRBLK_SIZE - EFS_DIRBLK_HEADERSIZE];
+};
+
+/* Offsets in DirItem */
+#define EFS_DI_NAMELEN      4
+#define EFS_DI_NAME         5
+
+struct efs_dent {
+	union {
+		__u32	l;
+		__u16	s[2];
+	} ud_inum;
+	__u8	d_namelen;
+	__u8	d_name[3];
+};
+
+#define EFS_EXT_PER_BLK_BITS     5
+#define EFS_EXT_PER_BLK_MASK     63
+#define EFS_EXT_SIZE_BITS        3
+
+/* define a few convenient types */
+#if 0
+typedef unsigned char	    BYTE;  /* 8 bit */
+typedef unsigned short	    SHORT; /* 16 bit */
+typedef unsigned long	    LONG;  /* 32 bit */
+#endif
+
+#ifdef __KERNEL__
+
+struct efs_dir_entry {
+  __u16 inode;
+  char name[0];
+};
+
+/* Byte swapping 32/16-bit quantities into little endian format. */
+#define efs_need_swab 0
+/* extern int efs_need_swab; */
+
+extern __inline__ __u32 efs_swab32(__u32 value)
+{
+	return (efs_need_swab ? ((value >> 24) |
+				((value >> 8) & 0xff00) |
+				((value << 8) & 0xff0000) |
+				 (value << 24)) : value);
+}
+
+extern __inline__ __u16 efs_swab16(__u16 value)
+{
+	return (efs_need_swab ? ((value >> 8) |
+				 (value << 8)) : value);
+}
+
+int init_efs_fs(void);
+
+/* Inode Method structures for Dirs, Files and Symlinks */
+extern struct inode_operations efs_dir_in_ops;
+extern struct inode_operations efs_file_in_ops;
+extern struct inode_operations efs_symlink_in_ops;
+
+/* exported Prototypes */
+extern int efs_bmap(struct inode *,int);
+extern __u32 ConvertLong(__u8 *buf,int off);
+extern __u16 ConvertShort(__u8 *buf,int off);
+
+#endif /* __KERNEL__ */
+
+#endif /* __LINUX_EFS_FS_H */
diff --git a/include/linux/efs_fs_i.h b/include/linux/efs_fs_i.h
new file mode 100644
index 000000000..5e6441df7
--- /dev/null
+++ b/include/linux/efs_fs_i.h
@@ -0,0 +1,27 @@
+/*
+ *   linux/include/linux/efs_fs_i.h
+ *
+ * Copyright (C) 1997
+ * Mike Shaver (shaver@neon.ingenia.ca)
+ *
+ * Based on work Copyright (C) 1995, 1996 Christian Vogelgsang.
+ *
+ * $Id$
+ */
+
+#ifndef __LINUX_EFS_FS_I_H
+#define __LINUX_EFS_FS_I_H
+
+#include <linux/efs_fs.h>
+
+/* private Inode part */
+struct efs_inode_info {
+  __u32  extblk;
+  
+  __u16 tot;
+  __u16 cur;
+
+  union efs_extent  extents[EFS_MAX_EXTENTS];
+};
+
+#endif /* __LINUX_EFS_FS_I_H */
diff --git a/include/linux/efs_fs_sb.h b/include/linux/efs_fs_sb.h
new file mode 100644
index 000000000..b3f887899
--- /dev/null
+++ b/include/linux/efs_fs_sb.h
@@ -0,0 +1,29 @@
+/*
+ *   linux/include/linux/efs_fs_sb.h
+ *
+ * Copyright (C) 1997
+ * Mike Shaver (shaver@neon.ingenia.ca)
+ *
+ * Based on work Copyright (C) 1995, 1996 Christian Vogelgsang.
+ *
+ * $Id$
+ */
+
+#ifndef __LINUX_EFS_FS_SB_H
+#define __LINUX_EFS_FS_SB_H
+
+#include <linux/efs_fs.h>
+
+/* EFS Superblock Information */
+struct efs_sb_info {
+	__u32   fs_start;      /* first block of filesystem */
+	__u32   total_blocks;  /* total number of blocks in filesystem */
+	__u32   first_block;   /* first data block in filesystem */
+	__u32 	group_size;    /* number of blocks a group consists of */ 
+	__u16 	inode_blocks;  /* number of blocks used for inodes in 
+				* every group */
+	__u16   total_groups;  /* number of groups */
+};
+
+
+#endif /* __LINUX_UFS_FS_SB_H */