diff options
| -rw-r--r-- | obsolete-buildroot/sources/openwrt-wrt54g-linux.patch | 2717 |
1 files changed, 0 insertions, 2717 deletions
diff --git a/obsolete-buildroot/sources/openwrt-wrt54g-linux.patch b/obsolete-buildroot/sources/openwrt-wrt54g-linux.patch index 6f12c974e..37c1dd34f 100644 --- a/obsolete-buildroot/sources/openwrt-wrt54g-linux.patch +++ b/obsolete-buildroot/sources/openwrt-wrt54g-linux.patch @@ -1851,1636 +1851,6 @@ diff -Nurb src/linux/linux.orig/include/linux/fs.h src/linux/linux/include/linux void *generic_sbp; } u; /* -diff -Nurb src/linux/linux.orig/include/linux/fs.h.orig src/linux/linux/include/linux/fs.h.orig ---- src/linux/linux.orig/include/linux/fs.h.orig 1969-12-31 19:00:00.000000000 -0500 -+++ src/linux/linux/include/linux/fs.h.orig 2004-05-25 21:12:42.000000000 -0400 -@@ -0,0 +1,1626 @@ -+#ifndef _LINUX_FS_H -+#define _LINUX_FS_H -+ -+/* -+ * This file has definitions for some important file table -+ * structures etc. -+ */ -+ -+#include <linux/config.h> -+#include <linux/linkage.h> -+#include <linux/limits.h> -+#include <linux/wait.h> -+#include <linux/types.h> -+#include <linux/vfs.h> -+#include <linux/net.h> -+#include <linux/kdev_t.h> -+#include <linux/ioctl.h> -+#include <linux/list.h> -+#include <linux/dcache.h> -+#include <linux/stat.h> -+#include <linux/cache.h> -+#include <linux/stddef.h> -+#include <linux/string.h> -+ -+#include <asm/atomic.h> -+#include <asm/bitops.h> -+ -+struct poll_table_struct; -+ -+ -+/* -+ * It's silly to have NR_OPEN bigger than NR_FILE, but you can change -+ * the file limit at runtime and only root can increase the per-process -+ * nr_file rlimit, so it's safe to set up a ridiculously high absolute -+ * upper limit on files-per-process. -+ * -+ * Some programs (notably those using select()) may have to be -+ * recompiled to take full advantage of the new limits.. -+ */ -+ -+/* Fixed constants first: */ -+#undef NR_OPEN -+#define NR_OPEN (1024*1024) /* Absolute upper limit on fd num */ -+#define INR_OPEN 1024 /* Initial setting for nfile rlimits */ -+ -+#define BLOCK_SIZE_BITS 10 -+#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS) -+ -+/* And dynamically-tunable limits and defaults: */ -+struct files_stat_struct { -+ int nr_files; /* read only */ -+ int nr_free_files; /* read only */ -+ int max_files; /* tunable */ -+}; -+extern struct files_stat_struct files_stat; -+ -+struct inodes_stat_t { -+ int nr_inodes; -+ int nr_unused; -+ int dummy[5]; -+}; -+extern struct inodes_stat_t inodes_stat; -+ -+extern int leases_enable, dir_notify_enable, lease_break_time; -+ -+#define NR_FILE 8192 /* this can well be larger on a larger system */ -+#define NR_RESERVED_FILES 10 /* reserved for root */ -+#define NR_SUPER 256 -+ -+#define MAY_EXEC 1 -+#define MAY_WRITE 2 -+#define MAY_READ 4 -+ -+#define FMODE_READ 1 -+#define FMODE_WRITE 2 -+ -+#define READ 0 -+#define WRITE 1 -+#define READA 2 /* read-ahead - don't block if no resources */ -+#define SPECIAL 4 /* For non-blockdevice requests in request queue */ -+ -+#define SEL_IN 1 -+#define SEL_OUT 2 -+#define SEL_EX 4 -+ -+/* public flags for file_system_type */ -+#define FS_REQUIRES_DEV 1 -+#define FS_NO_DCACHE 2 /* Only dcache the necessary things. */ -+#define FS_NO_PRELIM 4 /* prevent preloading of dentries, even if -+ * FS_NO_DCACHE is not set. -+ */ -+#define FS_SINGLE 8 /* Filesystem that can have only one superblock */ -+#define FS_NOMOUNT 16 /* Never mount from userland */ -+#define FS_LITTER 32 /* Keeps the tree in dcache */ -+#define FS_ODD_RENAME 32768 /* Temporary stuff; will go away as soon -+ * as nfs_rename() will be cleaned up -+ */ -+/* -+ * These are the fs-independent mount-flags: up to 32 flags are supported -+ */ -+#define MS_RDONLY 1 /* Mount read-only */ -+#define MS_NOSUID 2 /* Ignore suid and sgid bits */ -+#define MS_NODEV 4 /* Disallow access to device special files */ -+#define MS_NOEXEC 8 /* Disallow program execution */ -+#define MS_SYNCHRONOUS 16 /* Writes are synced at once */ -+#define MS_REMOUNT 32 /* Alter flags of a mounted FS */ -+#define MS_MANDLOCK 64 /* Allow mandatory locks on an FS */ -+#define MS_NOATIME 1024 /* Do not update access times. */ -+#define MS_NODIRATIME 2048 /* Do not update directory access times */ -+#define MS_BIND 4096 -+#define MS_MOVE 8192 -+#define MS_REC 16384 -+#define MS_VERBOSE 32768 -+#define MS_ACTIVE (1<<30) -+#define MS_NOUSER (1<<31) -+ -+/* -+ * Superblock flags that can be altered by MS_REMOUNT -+ */ -+#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME|\ -+ MS_NODIRATIME) -+ -+/* -+ * Old magic mount flag and mask -+ */ -+#define MS_MGC_VAL 0xC0ED0000 -+#define MS_MGC_MSK 0xffff0000 -+ -+/* Inode flags - they have nothing to superblock flags now */ -+ -+#define S_SYNC 1 /* Writes are synced at once */ -+#define S_NOATIME 2 /* Do not update access times */ -+#define S_QUOTA 4 /* Quota initialized for file */ -+#define S_APPEND 8 /* Append-only file */ -+#define S_IMMUTABLE 16 /* Immutable file */ -+#define S_DEAD 32 /* removed, but still open directory */ -+#define S_NOQUOTA 64 /* Inode is not counted to quota */ -+ -+/* -+ * Note that nosuid etc flags are inode-specific: setting some file-system -+ * flags just means all the inodes inherit those flags by default. It might be -+ * possible to override it selectively if you really wanted to with some -+ * ioctl() that is not currently implemented. -+ * -+ * Exception: MS_RDONLY is always applied to the entire file system. -+ * -+ * Unfortunately, it is possible to change a filesystems flags with it mounted -+ * with files in use. This means that all of the inodes will not have their -+ * i_flags updated. Hence, i_flags no longer inherit the superblock mount -+ * flags, so these have to be checked separately. -- rmk@arm.uk.linux.org -+ */ -+#define __IS_FLG(inode,flg) ((inode)->i_sb->s_flags & (flg)) -+ -+#define IS_RDONLY(inode) ((inode)->i_sb->s_flags & MS_RDONLY) -+#define IS_SYNC(inode) (__IS_FLG(inode, MS_SYNCHRONOUS) || ((inode)->i_flags & S_SYNC)) -+#define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK) -+ -+#define IS_QUOTAINIT(inode) ((inode)->i_flags & S_QUOTA) -+#define IS_NOQUOTA(inode) ((inode)->i_flags & S_NOQUOTA) -+#define IS_APPEND(inode) ((inode)->i_flags & S_APPEND) -+#define IS_IMMUTABLE(inode) ((inode)->i_flags & S_IMMUTABLE) -+#define IS_NOATIME(inode) (__IS_FLG(inode, MS_NOATIME) || ((inode)->i_flags & S_NOATIME)) -+#define IS_NODIRATIME(inode) __IS_FLG(inode, MS_NODIRATIME) -+ -+#define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD) -+ -+/* the read-only stuff doesn't really belong here, but any other place is -+ probably as bad and I don't want to create yet another include file. */ -+ -+#define BLKROSET _IO(0x12,93) /* set device read-only (0 = read-write) */ -+#define BLKROGET _IO(0x12,94) /* get read-only status (0 = read_write) */ -+#define BLKRRPART _IO(0x12,95) /* re-read partition table */ -+#define BLKGETSIZE _IO(0x12,96) /* return device size /512 (long *arg) */ -+#define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ -+#define BLKRASET _IO(0x12,98) /* Set read ahead for block device */ -+#define BLKRAGET _IO(0x12,99) /* get current read ahead setting */ -+#define BLKFRASET _IO(0x12,100)/* set filesystem (mm/filemap.c) read-ahead */ -+#define BLKFRAGET _IO(0x12,101)/* get filesystem (mm/filemap.c) read-ahead */ -+#define BLKSECTSET _IO(0x12,102)/* set max sectors per request (ll_rw_blk.c) */ -+#define BLKSECTGET _IO(0x12,103)/* get max sectors per request (ll_rw_blk.c) */ -+#define BLKSSZGET _IO(0x12,104)/* get block device sector size */ -+/* A jump here: 108-111 have been used for various private purposes. */ -+#define BLKBSZGET _IOR(0x12,112,sizeof(int)) -+#define BLKBSZSET _IOW(0x12,113,sizeof(int)) -+#define BLKGETSIZE64 _IOR(0x12,114,sizeof(u64)) /* return device size in bytes (u64 *arg) */ -+ -+#define BMAP_IOCTL 1 /* obsolete - kept for compatibility */ -+#define FIBMAP _IO(0x00,1) /* bmap access */ -+#define FIGETBSZ _IO(0x00,2) /* get the block size used for bmap */ -+ -+#ifdef __KERNEL__ -+ -+#include <asm/semaphore.h> -+#include <asm/byteorder.h> -+ -+extern void update_atime (struct inode *); -+#define UPDATE_ATIME(inode) update_atime (inode) -+ -+extern void buffer_init(unsigned long); -+extern void inode_init(unsigned long); -+extern void mnt_init(unsigned long); -+extern void files_init(unsigned long mempages); -+ -+/* bh state bits */ -+enum bh_state_bits { -+ BH_Uptodate, /* 1 if the buffer contains valid data */ -+ BH_Dirty, /* 1 if the buffer is dirty */ -+ BH_Lock, /* 1 if the buffer is locked */ -+ BH_Req, /* 0 if the buffer has been invalidated */ -+ BH_Mapped, /* 1 if the buffer has a disk mapping */ -+ BH_New, /* 1 if the buffer is new and not yet written out */ -+ BH_Async, /* 1 if the buffer is under end_buffer_io_async I/O */ -+ BH_Wait_IO, /* 1 if we should write out this buffer */ -+ BH_Launder, /* 1 if we can throttle on this buffer */ -+ BH_JBD, /* 1 if it has an attached journal_head */ -+ -+ BH_PrivateStart,/* not a state bit, but the first bit available -+ * for private allocation by other entities -+ */ -+}; -+ -+#define MAX_BUF_PER_PAGE (PAGE_CACHE_SIZE / 512) -+ -+/* -+ * Try to keep the most commonly used fields in single cache lines (16 -+ * bytes) to improve performance. This ordering should be -+ * particularly beneficial on 32-bit processors. -+ * -+ * We use the first 16 bytes for the data which is used in searches -+ * over the block hash lists (ie. getblk() and friends). -+ * -+ * The second 16 bytes we use for lru buffer scans, as used by -+ * sync_buffers() and refill_freelist(). -- sct -+ */ -+struct buffer_head { -+ /* First cache line: */ -+ struct buffer_head *b_next; /* Hash queue list */ -+ unsigned long b_blocknr; /* block number */ -+ unsigned short b_size; /* block size */ -+ unsigned short b_list; /* List that this buffer appears */ -+ kdev_t b_dev; /* device (B_FREE = free) */ -+ -+ atomic_t b_count; /* users using this block */ -+ kdev_t b_rdev; /* Real device */ -+ unsigned long b_state; /* buffer state bitmap (see above) */ -+ unsigned long b_flushtime; /* Time when (dirty) buffer should be written */ -+ -+ struct buffer_head *b_next_free;/* lru/free list linkage */ -+ struct buffer_head *b_prev_free;/* doubly linked list of buffers */ -+ struct buffer_head *b_this_page;/* circular list of buffers in one page */ -+ struct buffer_head *b_reqnext; /* request queue */ -+ -+ struct buffer_head **b_pprev; /* doubly linked list of hash-queue */ -+ char * b_data; /* pointer to data block */ -+ struct page *b_page; /* the page this bh is mapped to */ -+ void (*b_end_io)(struct buffer_head *bh, int uptodate); /* I/O completion */ -+ void *b_private; /* reserved for b_end_io */ -+ -+ unsigned long b_rsector; /* Real buffer location on disk */ -+ wait_queue_head_t b_wait; -+ -+ struct inode * b_inode; -+ struct list_head b_inode_buffers; /* doubly linked list of inode dirty buffers */ -+}; -+ -+typedef void (bh_end_io_t)(struct buffer_head *bh, int uptodate); -+void init_buffer(struct buffer_head *, bh_end_io_t *, void *); -+ -+#define __buffer_state(bh, state) (((bh)->b_state & (1UL << BH_##state)) != 0) -+ -+#define buffer_uptodate(bh) __buffer_state(bh,Uptodate) -+#define buffer_dirty(bh) __buffer_state(bh,Dirty) -+#define buffer_locked(bh) __buffer_state(bh,Lock) -+#define buffer_req(bh) __buffer_state(bh,Req) -+#define buffer_mapped(bh) __buffer_state(bh,Mapped) -+#define buffer_new(bh) __buffer_state(bh,New) -+#define buffer_async(bh) __buffer_state(bh,Async) -+#define buffer_launder(bh) __buffer_state(bh,Launder) -+ -+#define bh_offset(bh) ((unsigned long)(bh)->b_data & ~PAGE_MASK) -+ -+extern void set_bh_page(struct buffer_head *bh, struct page *page, unsigned long offset); -+ -+#define touch_buffer(bh) mark_page_accessed(bh->b_page) -+ -+ -+#include <linux/pipe_fs_i.h> -+#include <linux/minix_fs_i.h> -+#include <linux/ext2_fs_i.h> -+#include <linux/ext3_fs_i.h> -+#include <linux/hpfs_fs_i.h> -+#include <linux/ntfs_fs_i.h> -+#include <linux/msdos_fs_i.h> -+#include <linux/umsdos_fs_i.h> -+#include <linux/iso_fs_i.h> -+#include <linux/nfs_fs_i.h> -+#include <linux/sysv_fs_i.h> -+#include <linux/affs_fs_i.h> -+#include <linux/ufs_fs_i.h> -+#include <linux/efs_fs_i.h> -+#include <linux/coda_fs_i.h> -+#include <linux/romfs_fs_i.h> -+#include <linux/shmem_fs.h> -+#include <linux/smb_fs_i.h> -+#include <linux/hfs_fs_i.h> -+#include <linux/adfs_fs_i.h> -+#include <linux/qnx4_fs_i.h> -+#include <linux/reiserfs_fs_i.h> -+#include <linux/bfs_fs_i.h> -+#include <linux/udf_fs_i.h> -+#include <linux/ncp_fs_i.h> -+#include <linux/proc_fs_i.h> -+#include <linux/usbdev_fs_i.h> -+#include <linux/jffs2_fs_i.h> -+#include <linux/cramfs_fs_sb.h> -+ -+/* -+ * Attribute flags. These should be or-ed together to figure out what -+ * has been changed! -+ */ -+#define ATTR_MODE 1 -+#define ATTR_UID 2 -+#define ATTR_GID 4 -+#define ATTR_SIZE 8 -+#define ATTR_ATIME 16 -+#define ATTR_MTIME 32 -+#define ATTR_CTIME 64 -+#define ATTR_ATIME_SET 128 -+#define ATTR_MTIME_SET 256 -+#define ATTR_FORCE 512 /* Not a change, but a change it */ -+#define ATTR_ATTR_FLAG 1024 -+ -+/* -+ * This is the Inode Attributes structure, used for notify_change(). It -+ * uses the above definitions as flags, to know which values have changed. -+ * Also, in this manner, a Filesystem can look at only the values it cares -+ * about. Basically, these are the attributes that the VFS layer can -+ * request to change from the FS layer. -+ * -+ * Derek Atkins <warlord@MIT.EDU> 94-10-20 -+ */ -+struct iattr { -+ unsigned int ia_valid; -+ umode_t ia_mode; -+ uid_t ia_uid; -+ gid_t ia_gid; -+ loff_t ia_size; -+ time_t ia_atime; -+ time_t ia_mtime; -+ time_t ia_ctime; -+ unsigned int ia_attr_flags; -+}; -+ -+/* -+ * This is the inode attributes flag definitions -+ */ -+#define ATTR_FLAG_SYNCRONOUS 1 /* Syncronous write */ -+#define ATTR_FLAG_NOATIME 2 /* Don't update atime */ -+#define ATTR_FLAG_APPEND 4 /* Append-only file */ -+#define ATTR_FLAG_IMMUTABLE 8 /* Immutable file */ -+#define ATTR_FLAG_NODIRATIME 16 /* Don't update atime for directory */ -+ -+/* -+ * Includes for diskquotas and mount structures. -+ */ -+#include <linux/quota.h> -+#include <linux/mount.h> -+ -+/* -+ * oh the beauties of C type declarations. -+ */ -+struct page; -+struct address_space; -+struct kiobuf; -+ -+struct address_space_operations { -+ int (*writepage)(struct page *); -+ int (*readpage)(struct file *, struct page *); -+ int (*sync_page)(struct page *); -+ /* -+ * ext3 requires that a successful prepare_write() call be followed -+ * by a commit_write() call - they must be balanced -+ */ -+ int (*prepare_write)(struct file *, struct page *, unsigned, unsigned); -+ int (*commit_write)(struct file *, struct page *, unsigned, unsigned); -+ /* Unfortunately this kludge is needed for FIBMAP. Don't use it */ -+ int (*bmap)(struct address_space *, long); -+ int (*flushpage) (struct page *, unsigned long); -+ int (*releasepage) (struct page *, int); -+#define KERNEL_HAS_O_DIRECT /* this is for modules out of the kernel */ -+ int (*direct_IO)(int, struct inode *, struct kiobuf *, unsigned long, int); -+}; -+ -+struct address_space { -+ struct list_head clean_pages; /* list of clean pages */ -+ struct list_head dirty_pages; /* list of dirty pages */ -+ struct list_head locked_pages; /* list of locked pages */ -+ unsigned long nrpages; /* number of total pages */ -+ struct address_space_operations *a_ops; /* methods */ -+ struct inode *host; /* owner: inode, block_device */ -+ struct vm_area_struct *i_mmap; /* list of private mappings */ -+ struct vm_area_struct *i_mmap_shared; /* list of shared mappings */ -+ spinlock_t i_shared_lock; /* and spinlock protecting it */ -+ int gfp_mask; /* how to allocate the pages */ -+}; -+ -+struct char_device { -+ struct list_head hash; -+ atomic_t count; -+ dev_t dev; -+ atomic_t openers; -+ struct semaphore sem; -+}; -+ -+struct block_device { -+ struct list_head bd_hash; -+ atomic_t bd_count; -+ struct inode * bd_inode; -+ dev_t bd_dev; /* not a kdev_t - it's a search key */ -+ int bd_openers; -+ const struct block_device_operations *bd_op; -+ struct semaphore bd_sem; /* open/close mutex */ -+ struct list_head bd_inodes; -+}; -+ -+struct inode { -+ struct list_head i_hash; -+ struct list_head i_list; -+ struct list_head i_dentry; -+ -+ struct list_head i_dirty_buffers; -+ struct list_head i_dirty_data_buffers; -+ -+ unsigned long i_ino; -+ atomic_t i_count; -+ kdev_t i_dev; -+ umode_t i_mode; -+ nlink_t i_nlink; -+ uid_t i_uid; -+ gid_t i_gid; -+ kdev_t i_rdev; -+ loff_t i_size; -+ time_t i_atime; -+ time_t i_mtime; -+ time_t i_ctime; -+ unsigned int i_blkbits; -+ unsigned long i_blksize; -+ unsigned long i_blocks; -+ unsigned long i_version; -+ struct semaphore i_sem; -+ struct semaphore i_zombie; -+ struct inode_operations *i_op; -+ struct file_operations *i_fop; /* former ->i_op->default_file_ops */ -+ struct super_block *i_sb; -+ wait_queue_head_t i_wait; -+ struct file_lock *i_flock; -+ struct address_space *i_mapping; -+ struct address_space i_data; -+ struct dquot *i_dquot[MAXQUOTAS]; -+ /* These three should probably be a union */ -+ struct list_head i_devices; -+ struct pipe_inode_info *i_pipe; -+ struct block_device *i_bdev; -+ struct char_device *i_cdev; -+ -+ unsigned long i_dnotify_mask; /* Directory notify events */ -+ struct dnotify_struct *i_dnotify; /* for directory notifications */ -+ -+ unsigned long i_state; -+ -+ unsigned int i_flags; -+ unsigned char i_sock; -+ -+ atomic_t i_writecount; -+ unsigned int i_attr_flags; -+ __u32 i_generation; -+ union { -+ struct minix_inode_info minix_i; -+ struct ext2_inode_info ext2_i; -+ struct ext3_inode_info ext3_i; -+ struct hpfs_inode_info hpfs_i; -+ struct ntfs_inode_info ntfs_i; -+ struct msdos_inode_info msdos_i; -+ struct umsdos_inode_info umsdos_i; -+ struct iso_inode_info isofs_i; -+ struct nfs_inode_info nfs_i; -+ struct sysv_inode_info sysv_i; -+ struct affs_inode_info affs_i; -+ struct ufs_inode_info ufs_i; -+ struct efs_inode_info efs_i; -+ struct romfs_inode_info romfs_i; -+ struct shmem_inode_info shmem_i; -+ struct coda_inode_info coda_i; -+ struct smb_inode_info smbfs_i; -+ struct hfs_inode_info hfs_i; -+ struct adfs_inode_info adfs_i; -+ struct qnx4_inode_info qnx4_i; -+ struct reiserfs_inode_info reiserfs_i; -+ struct bfs_inode_info bfs_i; -+ struct udf_inode_info udf_i; -+ struct ncp_inode_info ncpfs_i; -+ struct proc_inode_info proc_i; -+ struct socket socket_i; -+ struct usbdev_inode_info usbdev_i; -+ struct jffs2_inode_info jffs2_i; -+ void *generic_ip; -+ } u; -+}; -+ -+struct fown_struct { -+ int pid; /* pid or -pgrp where SIGIO should be sent */ -+ uid_t uid, euid; /* uid/euid of process setting the owner */ -+ int signum; /* posix.1b rt signal to be delivered on IO */ -+}; -+ -+struct file { -+ struct list_head f_list; -+ struct dentry *f_dentry; -+ struct vfsmount *f_vfsmnt; -+ struct file_operations *f_op; -+ atomic_t f_count; -+ unsigned int f_flags; -+ mode_t f_mode; -+ loff_t f_pos; -+ unsigned long f_reada, f_ramax, f_raend, f_ralen, f_rawin; -+ struct fown_struct f_owner; -+ unsigned int f_uid, f_gid; -+ int f_error; -+ -+ unsigned long f_version; -+ -+ /* needed for tty driver, and maybe others */ -+ void *private_data; -+ -+ /* preallocated helper kiobuf to speedup O_DIRECT */ -+ struct kiobuf *f_iobuf; -+ long f_iobuf_lock; -+}; -+extern spinlock_t files_lock; -+#define file_list_lock() spin_lock(&files_lock); -+#define file_list_unlock() spin_unlock(&files_lock); -+ -+#define get_file(x) atomic_inc(&(x)->f_count) -+#define file_count(x) atomic_read(&(x)->f_count) -+ -+extern int init_private_file(struct file *, struct dentry *, int); -+ -+#define MAX_NON_LFS ((1UL<<31) - 1) -+ -+/* Page cache limit. The filesystems should put that into their s_maxbytes -+ limits, otherwise bad things can happen in VM. */ -+#if BITS_PER_LONG==32 -+#define MAX_LFS_FILESIZE (((u64)PAGE_CACHE_SIZE << (BITS_PER_LONG-1))-1) -+#elif BITS_PER_LONG==64 -+#define MAX_LFS_FILESIZE 0x7fffffffffffffff -+#endif -+ -+#define FL_POSIX 1 -+#define FL_FLOCK 2 -+#define FL_BROKEN 4 /* broken flock() emulation */ -+#define FL_ACCESS 8 /* for processes suspended by mandatory locking */ -+#define FL_LOCKD 16 /* lock held by rpc.lockd */ -+#define FL_LEASE 32 /* lease held on this file */ -+ -+/* -+ * The POSIX file lock owner is determined by -+ * the "struct files_struct" in the thread group -+ * (or NULL for no owner - BSD locks). -+ * -+ * Lockd stuffs a "host" pointer into this. -+ */ -+typedef struct files_struct *fl_owner_t; -+ -+struct file_lock { -+ struct file_lock *fl_next; /* singly linked list for this inode */ -+ struct list_head fl_link; /* doubly linked list of all locks */ -+ struct list_head fl_block; /* circular list of blocked processes */ -+ fl_owner_t fl_owner; -+ unsigned int fl_pid; -+ wait_queue_head_t fl_wait; -+ struct file *fl_file; -+ unsigned char fl_flags; -+ unsigned char fl_type; -+ loff_t fl_start; -+ loff_t fl_end; -+ -+ void (*fl_notify)(struct file_lock *); /* unblock callback */ -+ void (*fl_insert)(struct file_lock *); /* lock insertion callback */ -+ void (*fl_remove)(struct file_lock *); /* lock removal callback */ -+ -+ struct fasync_struct * fl_fasync; /* for lease break notifications */ -+ unsigned long fl_break_time; /* for nonblocking lease breaks */ -+ -+ union { -+ struct nfs_lock_info nfs_fl; -+ } fl_u; -+}; -+ -+/* The following constant reflects the upper bound of the file/locking space */ -+#ifndef OFFSET_MAX -+#define INT_LIMIT(x) (~((x)1 << (sizeof(x)*8 - 1))) -+#define OFFSET_MAX INT_LIMIT(loff_t) -+#define OFFT_OFFSET_MAX INT_LIMIT(off_t) -+#endif -+ -+extern struct list_head file_lock_list; -+ -+#include <linux/fcntl.h> -+ -+extern int fcntl_getlk(unsigned int, struct flock *); -+extern int fcntl_setlk(unsigned int, unsigned int, struct flock *); -+ -+extern int fcntl_getlk64(unsigned int, struct flock64 *); -+extern int fcntl_setlk64(unsigned int, unsigned int, struct flock64 *); -+ -+/* fs/locks.c */ -+extern void locks_init_lock(struct file_lock *); -+extern void locks_copy_lock(struct file_lock *, struct file_lock *); -+extern void locks_remove_posix(struct file *, fl_owner_t); -+extern void locks_remove_flock(struct file *); -+extern struct file_lock *posix_test_lock(struct file *, struct file_lock *); -+extern int posix_lock_file(struct file *, struct file_lock *, unsigned int); -+extern void posix_block_lock(struct file_lock *, struct file_lock *); -+extern void posix_unblock_lock(struct file_lock *); -+extern int posix_locks_deadlock(struct file_lock *, struct file_lock *); -+extern int __get_lease(struct inode *inode, unsigned int flags); -+extern time_t lease_get_mtime(struct inode *); -+extern int lock_may_read(struct inode *, loff_t start, unsigned long count); -+extern int lock_may_write(struct inode *, loff_t start, unsigned long count); -+ -+struct fasync_struct { -+ int magic; -+ int fa_fd; -+ struct fasync_struct *fa_next; /* singly linked list */ -+ struct file *fa_file; -+}; -+ -+#define FASYNC_MAGIC 0x4601 -+ -+/* SMP safe fasync helpers: */ -+extern int fasync_helper(int, struct file *, int, struct fasync_struct **); -+/* can be called from interrupts */ -+extern void kill_fasync(struct fasync_struct **, int, int); -+/* only for net: no internal synchronization */ -+extern void __kill_fasync(struct fasync_struct *, int, int); -+ -+struct nameidata { -+ struct dentry *dentry; -+ struct vfsmount *mnt; -+ struct qstr last; -+ unsigned int flags; -+ int last_type; -+}; -+ -+#define DQUOT_USR_ENABLED 0x01 /* User diskquotas enabled */ -+#define DQUOT_GRP_ENABLED 0x02 /* Group diskquotas enabled */ -+ -+struct quota_mount_options -+{ -+ unsigned int flags; /* Flags for diskquotas on this device */ -+ struct semaphore dqio_sem; /* lock device while I/O in progress */ -+ struct semaphore dqoff_sem; /* serialize quota_off() and quota_on() on device */ -+ struct file *files[MAXQUOTAS]; /* fp's to quotafiles */ -+ time_t inode_expire[MAXQUOTAS]; /* expiretime for inode-quota */ -+ time_t block_expire[MAXQUOTAS]; /* expiretime for block-quota */ -+ char rsquash[MAXQUOTAS]; /* for quotas threat root as any other user */ -+}; -+ -+/* -+ * Umount options -+ */ -+ -+#define MNT_FORCE 0x00000001 /* Attempt to forcibily umount */ -+#define MNT_DETACH 0x00000002 /* Just detach from the tree */ -+ -+#include <linux/minix_fs_sb.h> -+#include <linux/ext2_fs_sb.h> -+#include <linux/ext3_fs_sb.h> -+#include <linux/hpfs_fs_sb.h> -+#include <linux/ntfs_fs_sb.h> -+#include <linux/msdos_fs_sb.h> -+#include <linux/iso_fs_sb.h> -+#include <linux/nfs_fs_sb.h> -+#include <linux/sysv_fs_sb.h> -+#include <linux/affs_fs_sb.h> -+#include <linux/ufs_fs_sb.h> -+#include <linux/efs_fs_sb.h> -+#include <linux/romfs_fs_sb.h> -+#include <linux/smb_fs_sb.h> -+#include <linux/hfs_fs_sb.h> -+#include <linux/adfs_fs_sb.h> -+#include <linux/qnx4_fs_sb.h> -+#include <linux/reiserfs_fs_sb.h> -+#include <linux/bfs_fs_sb.h> -+#include <linux/udf_fs_sb.h> -+#include <linux/ncp_fs_sb.h> -+#include <linux/usbdev_fs_sb.h> -+#include <linux/cramfs_fs_sb.h> -+#include <linux/jffs2_fs_sb.h> -+ -+extern struct list_head super_blocks; -+extern spinlock_t sb_lock; -+ -+#define sb_entry(list) list_entry((list), struct super_block, s_list) -+#define S_BIAS (1<<30) -+struct super_block { -+ struct list_head s_list; /* Keep this first */ -+ kdev_t s_dev; -+ unsigned long s_blocksize; -+ unsigned char s_blocksize_bits; -+ unsigned char s_dirt; -+ unsigned long long s_maxbytes; /* Max file size */ -+ struct file_system_type *s_type; -+ struct super_operations *s_op; -+ struct dquot_operations *dq_op; -+ unsigned long s_flags; -+ unsigned long s_magic; -+ struct dentry *s_root; -+ struct rw_semaphore s_umount; -+ struct semaphore s_lock; -+ int s_count; -+ atomic_t s_active; -+ -+ struct list_head s_dirty; /* dirty inodes */ -+ struct list_head s_locked_inodes;/* inodes being synced */ -+ struct list_head s_files; -+ -+ struct block_device *s_bdev; -+ struct list_head s_instances; -+ struct quota_mount_options s_dquot; /* Diskquota specific options */ -+ -+ union { -+ struct minix_sb_info minix_sb; -+ struct ext2_sb_info ext2_sb; -+ struct ext3_sb_info ext3_sb; -+ struct hpfs_sb_info hpfs_sb; -+ struct ntfs_sb_info ntfs_sb; -+ struct msdos_sb_info msdos_sb; -+ struct isofs_sb_info isofs_sb; -+ struct nfs_sb_info nfs_sb; -+ struct sysv_sb_info sysv_sb; -+ struct affs_sb_info affs_sb; -+ struct ufs_sb_info ufs_sb; -+ struct efs_sb_info efs_sb; -+ struct shmem_sb_info shmem_sb; -+ struct romfs_sb_info romfs_sb; -+ struct smb_sb_info smbfs_sb; -+ struct hfs_sb_info hfs_sb; -+ struct adfs_sb_info adfs_sb; -+ struct qnx4_sb_info qnx4_sb; -+ struct reiserfs_sb_info reiserfs_sb; -+ struct bfs_sb_info bfs_sb; -+ struct udf_sb_info udf_sb; -+ struct ncp_sb_info ncpfs_sb; -+ struct usbdev_sb_info usbdevfs_sb; -+ struct jffs2_sb_info jffs2_sb; -+ struct cramfs_sb_info cramfs_sb; -+ void *generic_sbp; -+ } u; -+ /* -+ * The next field is for VFS *only*. No filesystems have any business -+ * even looking at it. You had been warned. -+ */ -+ struct semaphore s_vfs_rename_sem; /* Kludge */ -+ -+ /* The next field is used by knfsd when converting a (inode number based) -+ * file handle into a dentry. As it builds a path in the dcache tree from -+ * the bottom up, there may for a time be a subpath of dentrys which is not -+ * connected to the main tree. This semaphore ensure that there is only ever -+ * one such free path per filesystem. Note that unconnected files (or other -+ * non-directories) are allowed, but not unconnected diretories. -+ */ -+ struct semaphore s_nfsd_free_path_sem; -+}; -+ -+/* -+ * VFS helper functions.. -+ */ -+extern int vfs_create(struct inode *, struct dentry *, int); -+extern int vfs_mkdir(struct inode *, struct dentry *, int); -+extern int vfs_mknod(struct inode *, struct dentry *, int, dev_t); -+extern int vfs_symlink(struct inode *, struct dentry *, const char *); -+extern int vfs_link(struct dentry *, struct inode *, struct dentry *); -+extern int vfs_rmdir(struct inode *, struct dentry *); -+extern int vfs_unlink(struct inode *, struct dentry *); -+extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *); -+ -+/* -+ * File types -+ */ -+#define DT_UNKNOWN 0 -+#define DT_FIFO 1 -+#define DT_CHR 2 -+#define DT_DIR 4 -+#define DT_BLK 6 -+#define DT_REG 8 -+#define DT_LNK 10 -+#define DT_SOCK 12 -+#define DT_WHT 14 -+ -+/* -+ * This is the "filldir" function type, used by readdir() to let -+ * the kernel specify what kind of dirent layout it wants to have. -+ * This allows the kernel to read directories into kernel space or -+ * to have different dirent layouts depending on the binary type. -+ */ -+typedef int (*filldir_t)(void *, const char *, int, loff_t, ino_t, unsigned); -+ -+struct block_device_operations { -+ int (*open) (struct inode *, struct file *); -+ int (*release) (struct inode *, struct file *); -+ int (*ioctl) (struct inode *, struct file *, unsigned, unsigned long); -+ int (*check_media_change) (kdev_t); -+ int (*revalidate) (kdev_t); -+ struct module *owner; -+}; -+ -+/* -+ * NOTE: -+ * read, write, poll, fsync, readv, writev can be called -+ * without the big kernel lock held in all filesystems. -+ */ -+struct file_operations { -+ struct module *owner; -+ loff_t (*llseek) (struct file *, loff_t, int); -+ ssize_t (*read) (struct file *, char *, size_t, loff_t *); -+ ssize_t (*write) (struct file *, const char *, size_t, loff_t *); -+ int (*readdir) (struct file *, void *, filldir_t); -+ unsigned int (*poll) (struct file *, struct poll_table_struct *); -+ int (*ioctl) (struct inode *, struct file *, unsigned int, unsigned long); -+ int (*mmap) (struct file *, struct vm_area_struct *); -+ int (*open) (struct inode *, struct file *); -+ int (*flush) (struct file *); -+ int (*release) (struct inode *, struct file *); -+ int (*fsync) (struct file *, struct dentry *, int datasync); -+ int (*fasync) (int, struct file *, int); -+ int (*lock) (struct file *, int, struct file_lock *); -+ ssize_t (*readv) (struct file *, const struct iovec *, unsigned long, loff_t *); -+ ssize_t (*writev) (struct file *, const struct iovec *, unsigned long, loff_t *); -+ ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int); -+ unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); -+}; -+ -+struct inode_operations { -+ int (*create) (struct inode *,struct dentry *,int); -+ struct dentry * (*lookup) (struct inode *,struct dentry *); -+ int (*link) (struct dentry *,struct inode *,struct dentry *); -+ int (*unlink) (struct inode *,struct dentry *); -+ int (*symlink) (struct inode *,struct dentry *,const char *); -+ int (*mkdir) (struct inode *,struct dentry *,int); -+ int (*rmdir) (struct inode *,struct dentry *); -+ int (*mknod) (struct inode *,struct dentry *,int,int); -+ int (*rename) (struct inode *, struct dentry *, -+ struct inode *, struct dentry *); -+ int (*readlink) (struct dentry *, char *,int); -+ int (*follow_link) (struct dentry *, struct nameidata *); -+ void (*truncate) (struct inode *); -+ int (*permission) (struct inode *, int); -+ int (*revalidate) (struct dentry *); -+ int (*setattr) (struct dentry *, struct iattr *); -+ int (*getattr) (struct dentry *, struct iattr *); -+ int (*setxattr) (struct dentry *, const char *, void *, size_t, int); -+ ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t); -+ ssize_t (*listxattr) (struct dentry *, char *, size_t); -+ int (*removexattr) (struct dentry *, const char *); -+}; -+ -+struct seq_file; -+ -+/* -+ * NOTE: write_inode, delete_inode, clear_inode, put_inode can be called -+ * without the big kernel lock held in all filesystems. -+ */ -+struct super_operations { -+ void (*read_inode) (struct inode *); -+ -+ /* reiserfs kludge. reiserfs needs 64 bits of information to -+ ** find an inode. We are using the read_inode2 call to get -+ ** that information. We don't like this, and are waiting on some -+ ** VFS changes for the real solution. -+ ** iget4 calls read_inode2, iff it is defined -+ */ -+ void (*read_inode2) (struct inode *, void *) ; -+ void (*dirty_inode) (struct inode *); -+ void (*write_inode) (struct inode *, int); -+ void (*put_inode) (struct inode *); -+ void (*delete_inode) (struct inode *); -+ void (*put_super) (struct super_block *); -+ void (*write_super) (struct super_block *); -+ void (*write_super_lockfs) (struct super_block *); -+ void (*unlockfs) (struct super_block *); -+ int (*statfs) (struct super_block *, struct statfs *); -+ int (*remount_fs) (struct super_block *, int *, char *); -+ void (*clear_inode) (struct inode *); -+ void (*umount_begin) (struct super_block *); -+ -+ /* Following are for knfsd to interact with "interesting" filesystems -+ * Currently just reiserfs, but possibly FAT and others later -+ * -+ * fh_to_dentry is given a filehandle fragement with length, and a type flag -+ * and must return a dentry for the referenced object or, if "parent" is -+ * set, a dentry for the parent of the object. -+ * If a dentry cannot be found, a "root" dentry should be created and -+ * flaged as DCACHE_NFSD_DISCONNECTED. nfsd_iget is an example implementation. -+ * -+ * dentry_to_fh is given a dentry and must generate the filesys specific -+ * part of the file handle. Available length is passed in *lenp and used -+ * length should be returned therein. -+ * If need_parent is set, then dentry_to_fh should encode sufficient information -+ * to find the (current) parent. -+ * dentry_to_fh should return a 1byte "type" which will be passed back in -+ * the fhtype arguement to fh_to_dentry. Type of 0 is reserved. -+ * If filesystem was exportable before the introduction of fh_to_dentry, -+ * types 1 and 2 should be used is that same way as the generic code. -+ * Type 255 means error. -+ * -+ * Lengths are in units of 4bytes, not bytes. -+ */ -+ struct dentry * (*fh_to_dentry)(struct super_block *sb, __u32 *fh, int len, int fhtype, int parent); -+ int (*dentry_to_fh)(struct dentry *, __u32 *fh, int *lenp, int need_parent); -+ int (*show_options)(struct seq_file *, struct vfsmount *); -+}; -+ -+/* Inode state bits.. */ -+#define I_DIRTY_SYNC 1 /* Not dirty enough for O_DATASYNC */ -+#define I_DIRTY_DATASYNC 2 /* Data-related inode changes pending */ -+#define I_DIRTY_PAGES 4 /* Data-related inode changes pending */ -+#define I_LOCK 8 -+#define I_FREEING 16 -+#define I_CLEAR 32 -+ -+#define I_DIRTY (I_DIRTY_SYNC | I_DIRTY_DATASYNC | I_DIRTY_PAGES) -+ -+extern void __mark_inode_dirty(struct inode *, int); -+static inline void mark_inode_dirty(struct inode *inode) -+{ -+ __mark_inode_dirty(inode, I_DIRTY); -+} -+ -+static inline void mark_inode_dirty_sync(struct inode *inode) -+{ -+ __mark_inode_dirty(inode, I_DIRTY_SYNC); -+} -+ -+static inline void mark_inode_dirty_pages(struct inode *inode) -+{ -+ __mark_inode_dirty(inode, I_DIRTY_PAGES); -+} -+ -+struct dquot_operations { -+ void (*initialize) (struct inode *, short); -+ void (*drop) (struct inode *); -+ int (*alloc_block) (struct inode *, unsigned long, char); -+ int (*alloc_inode) (const struct inode *, unsigned long); -+ void (*free_block) (struct inode *, unsigned long); -+ void (*free_inode) (const struct inode *, unsigned long); -+ int (*transfer) (struct inode *, struct iattr *); -+}; -+ -+struct file_system_type { -+ const char *name; -+ int fs_flags; -+ struct super_block *(*read_super) (struct super_block *, void *, int); -+ struct module *owner; -+ struct file_system_type * next; -+ struct list_head fs_supers; -+}; -+ -+#define DECLARE_FSTYPE(var,type,read,flags) \ -+struct file_system_type var = { \ -+ name: type, \ -+ read_super: read, \ -+ fs_flags: flags, \ -+ owner: THIS_MODULE, \ -+} -+ -+#define DECLARE_FSTYPE_DEV(var,type,read) \ -+ DECLARE_FSTYPE(var,type,read,FS_REQUIRES_DEV) -+ -+/* Alas, no aliases. Too much hassle with bringing module.h everywhere */ -+#define fops_get(fops) \ -+ (((fops) && (fops)->owner) \ -+ ? ( try_inc_mod_count((fops)->owner) ? (fops) : NULL ) \ -+ : (fops)) -+ -+#define fops_put(fops) \ -+do { \ -+ if ((fops) && (fops)->owner) \ -+ __MOD_DEC_USE_COUNT((fops)->owner); \ -+} while(0) -+ -+extern int register_filesystem(struct file_system_type *); -+extern int unregister_filesystem(struct file_system_type *); -+extern struct vfsmount *kern_mount(struct file_system_type *); -+extern int may_umount(struct vfsmount *); -+extern long do_mount(char *, char *, char *, unsigned long, void *); -+ -+#define kern_umount mntput -+ -+extern int vfs_statfs(struct super_block *, struct statfs *); -+ -+/* Return value for VFS lock functions - tells locks.c to lock conventionally -+ * REALLY kosha for root NFS and nfs_lock -+ */ -+#define LOCK_USE_CLNT 1 -+ -+#define FLOCK_VERIFY_READ 1 -+#define FLOCK_VERIFY_WRITE 2 -+ -+extern int locks_mandatory_locked(struct inode *); -+extern int locks_mandatory_area(int, struct inode *, struct file *, loff_t, size_t); -+ -+/* -+ * Candidates for mandatory locking have the setgid bit set -+ * but no group execute bit - an otherwise meaningless combination. -+ */ -+#define MANDATORY_LOCK(inode) \ -+ (IS_MANDLOCK(inode) && ((inode)->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) -+ -+static inline int locks_verify_locked(struct inode *inode) -+{ -+ if (MANDATORY_LOCK(inode)) -+ return locks_mandatory_locked(inode); -+ return 0; -+} -+ -+static inline int locks_verify_area(int read_write, struct inode *inode, -+ struct file *filp, loff_t offset, -+ size_t count) -+{ -+ if (inode->i_flock && MANDATORY_LOCK(inode)) -+ return locks_mandatory_area(read_write, inode, filp, offset, count); -+ return 0; -+} -+ -+static inline int locks_verify_truncate(struct inode *inode, -+ struct file *filp, -+ loff_t size) -+{ -+ if (inode->i_flock && MANDATORY_LOCK(inode)) -+ return locks_mandatory_area( -+ FLOCK_VERIFY_WRITE, inode, filp, -+ size < inode->i_size ? size : inode->i_size, -+ (size < inode->i_size ? inode->i_size - size -+ : size - inode->i_size) -+ ); -+ return 0; -+} -+ -+static inline int get_lease(struct inode *inode, unsigned int mode) -+{ -+ if (inode->i_flock) -+ return __get_lease(inode, mode); -+ return 0; -+} -+ -+/* fs/open.c */ -+ -+asmlinkage long sys_open(const char *, int, int); -+asmlinkage long sys_close(unsigned int); /* yes, it's really unsigned */ -+extern int do_truncate(struct dentry *, loff_t start); -+ -+extern struct file *filp_open(const char *, int, int); -+extern struct file * dentry_open(struct dentry *, struct vfsmount *, int); -+extern int filp_close(struct file *, fl_owner_t id); -+extern char * getname(const char *); -+ -+/* fs/dcache.c */ -+extern void vfs_caches_init(unsigned long); -+ -+#define __getname() kmem_cache_alloc(names_cachep, SLAB_KERNEL) -+#define putname(name) kmem_cache_free(names_cachep, (void *)(name)) -+ -+enum {BDEV_FILE, BDEV_SWAP, BDEV_FS, BDEV_RAW}; -+extern int register_blkdev(unsigned int, const char *, struct block_device_operations *); -+extern int unregister_blkdev(unsigned int, const char *); -+extern struct block_device *bdget(dev_t); -+extern int bd_acquire(struct inode *inode); -+extern void bd_forget(struct inode *inode); -+extern void bdput(struct block_device *); -+extern struct char_device *cdget(dev_t); -+extern void cdput(struct char_device *); -+extern int blkdev_open(struct inode *, struct file *); -+extern int blkdev_close(struct inode *, struct file *); -+extern struct file_operations def_blk_fops; -+extern struct address_space_operations def_blk_aops; -+extern struct file_operations def_fifo_fops; -+extern int ioctl_by_bdev(struct block_device *, unsigned, unsigned long); -+extern int blkdev_get(struct block_device *, mode_t, unsigned, int); -+extern int blkdev_put(struct block_device *, int); -+ -+/* fs/devices.c */ -+extern const struct block_device_operations *get_blkfops(unsigned int); -+extern int register_chrdev(unsigned int, const char *, struct file_operations *); -+extern int unregister_chrdev(unsigned int, const char *); -+extern int chrdev_open(struct inode *, struct file *); -+extern const char * bdevname(kdev_t); -+extern const char * cdevname(kdev_t); -+extern const char * kdevname(kdev_t); -+extern void init_special_inode(struct inode *, umode_t, int); -+ -+/* Invalid inode operations -- fs/bad_inode.c */ -+extern void make_bad_inode(struct inode *); -+extern int is_bad_inode(struct inode *); -+ -+extern struct file_operations read_fifo_fops; -+extern struct file_operations write_fifo_fops; -+extern struct file_operations rdwr_fifo_fops; -+extern struct file_operations read_pipe_fops; -+extern struct file_operations write_pipe_fops; -+extern struct file_operations rdwr_pipe_fops; -+ -+extern int fs_may_remount_ro(struct super_block *); -+ -+extern int FASTCALL(try_to_free_buffers(struct page *, unsigned int)); -+extern void refile_buffer(struct buffer_head * buf); -+extern void create_empty_buffers(struct page *, kdev_t, unsigned long); -+extern void end_buffer_io_sync(struct buffer_head *bh, int uptodate); -+ -+/* reiserfs_writepage needs this */ -+extern void set_buffer_async_io(struct buffer_head *bh) ; -+ -+#define BUF_CLEAN 0 -+#define BUF_LOCKED 1 /* Buffers scheduled for write */ -+#define BUF_DIRTY 2 /* Dirty buffers, not yet scheduled for write */ -+#define NR_LIST 3 -+ -+static inline void get_bh(struct buffer_head * bh) -+{ -+ atomic_inc(&(bh)->b_count); -+} -+ -+static inline void put_bh(struct buffer_head *bh) -+{ -+ smp_mb__before_atomic_dec(); -+ atomic_dec(&bh->b_count); -+} -+ -+/* -+ * This is called by bh->b_end_io() handlers when I/O has completed. -+ */ -+static inline void mark_buffer_uptodate(struct buffer_head * bh, int on) -+{ -+ if (on) -+ set_bit(BH_Uptodate, &bh->b_state); -+ else -+ clear_bit(BH_Uptodate, &bh->b_state); -+} -+ -+#define atomic_set_buffer_clean(bh) test_and_clear_bit(BH_Dirty, &(bh)->b_state) -+ -+static inline void __mark_buffer_clean(struct buffer_head *bh) -+{ -+ refile_buffer(bh); -+} -+ -+static inline void mark_buffer_clean(struct buffer_head * bh) -+{ -+ if (atomic_set_buffer_clean(bh)) -+ __mark_buffer_clean(bh); -+} -+ -+extern void FASTCALL(__mark_dirty(struct buffer_head *bh)); -+extern void FASTCALL(__mark_buffer_dirty(struct buffer_head *bh)); -+extern void FASTCALL(mark_buffer_dirty(struct buffer_head *bh)); -+extern void FASTCALL(buffer_insert_inode_queue(struct buffer_head *, struct inode *)); -+extern void FASTCALL(buffer_insert_inode_data_queue(struct buffer_head *, struct inode *)); -+ -+static inline int atomic_set_buffer_dirty(struct buffer_head *bh) -+{ -+ return test_and_set_bit(BH_Dirty, &bh->b_state); -+} -+ -+static inline void mark_buffer_async(struct buffer_head * bh, int on) -+{ -+ if (on) -+ set_bit(BH_Async, &bh->b_state); -+ else -+ clear_bit(BH_Async, &bh->b_state); -+} -+ -+/* -+ * If an error happens during the make_request, this function -+ * has to be recalled. It marks the buffer as clean and not -+ * uptodate, and it notifys the upper layer about the end -+ * of the I/O. -+ */ -+static inline void buffer_IO_error(struct buffer_head * bh) -+{ -+ mark_buffer_clean(bh); -+ /* -+ * b_end_io has to clear the BH_Uptodate bitflag in the error case! -+ */ -+ bh->b_end_io(bh, 0); -+} -+ -+static inline void mark_buffer_dirty_inode(struct buffer_head *bh, struct inode *inode) -+{ -+ mark_buffer_dirty(bh); -+ buffer_insert_inode_queue(bh, inode); -+} -+ -+extern void set_buffer_flushtime(struct buffer_head *); -+extern void balance_dirty(void); -+extern int check_disk_change(kdev_t); -+extern int invalidate_inodes(struct super_block *); -+extern int invalidate_device(kdev_t, int); -+extern void invalidate_inode_pages(struct inode *); -+extern void invalidate_inode_pages2(struct address_space *); -+extern void invalidate_inode_buffers(struct inode *); -+#define invalidate_buffers(dev) __invalidate_buffers((dev), 0) -+#define destroy_buffers(dev) __invalidate_buffers((dev), 1) -+extern void invalidate_bdev(struct block_device *, int); -+extern void __invalidate_buffers(kdev_t dev, int); -+extern void sync_inodes(kdev_t); -+extern void sync_unlocked_inodes(void); -+extern void write_inode_now(struct inode *, int); -+extern int sync_buffers(kdev_t, int); -+extern void sync_dev(kdev_t); -+extern int fsync_dev(kdev_t); -+extern int fsync_super(struct super_block *); -+extern int fsync_no_super(kdev_t); -+extern void sync_inodes_sb(struct super_block *); -+extern int fsync_buffers_list(struct list_head *); -+static inline int fsync_inode_buffers(struct inode *inode) -+{ -+ return fsync_buffers_list(&inode->i_dirty_buffers); -+} -+static inline int fsync_inode_data_buffers(struct inode *inode) -+{ -+ return fsync_buffers_list(&inode->i_dirty_data_buffers); -+} -+extern int inode_has_buffers(struct inode *); -+extern int filemap_fdatasync(struct address_space *); -+extern int filemap_fdatawait(struct address_space *); -+extern void sync_supers(kdev_t); -+extern int bmap(struct inode *, int); -+extern int notify_change(struct dentry *, struct iattr *); -+extern int permission(struct inode *, int); -+extern int vfs_permission(struct inode *, int); -+extern int get_write_access(struct inode *); -+extern int deny_write_access(struct file *); -+static inline void put_write_access(struct inode * inode) -+{ -+ atomic_dec(&inode->i_writecount); -+} -+static inline void allow_write_access(struct file *file) -+{ -+ if (file) -+ atomic_inc(&file->f_dentry->d_inode->i_writecount); -+} -+extern int do_pipe(int *); -+ -+extern int open_namei(const char *, int, int, struct nameidata *); -+ -+extern int kernel_read(struct file *, unsigned long, char *, unsigned long); -+extern struct file * open_exec(const char *); -+ -+/* fs/dcache.c -- generic fs support functions */ -+extern int is_subdir(struct dentry *, struct dentry *); -+extern ino_t find_inode_number(struct dentry *, struct qstr *); -+ -+/* -+ * Kernel pointers have redundant information, so we can use a -+ * scheme where we can return either an error code or a dentry -+ * pointer with the same return value. -+ * -+ * This should be a per-architecture thing, to allow different -+ * error and pointer decisions. -+ */ -+static inline void *ERR_PTR(long error) -+{ -+ return (void *) error; -+} -+ -+static inline long PTR_ERR(const void *ptr) -+{ -+ return (long) ptr; -+} -+ -+static inline long IS_ERR(const void *ptr) -+{ -+ return (unsigned long)ptr > (unsigned long)-1000L; -+} -+ -+/* -+ * The bitmask for a lookup event: -+ * - follow links at the end -+ * - require a directory -+ * - ending slashes ok even for nonexistent files -+ * - internal "there are more path compnents" flag -+ */ -+#define LOOKUP_FOLLOW (1) -+#define LOOKUP_DIRECTORY (2) -+#define LOOKUP_CONTINUE (4) -+#define LOOKUP_POSITIVE (8) -+#define LOOKUP_PARENT (16) -+#define LOOKUP_NOALT (32) -+/* -+ * Type of the last component on LOOKUP_PARENT -+ */ -+enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND}; -+ -+/* -+ * "descriptor" for what we're up to with a read for sendfile(). -+ * This allows us to use the same read code yet -+ * have multiple different users of the data that -+ * we read from a file. -+ * -+ * The simplest case just copies the data to user -+ * mode. -+ */ -+typedef struct { -+ size_t written; -+ size_t count; -+ char * buf; -+ int error; -+} read_descriptor_t; -+ -+typedef int (*read_actor_t)(read_descriptor_t *, struct page *, unsigned long, unsigned long); -+ -+/* needed for stackable file system support */ -+extern loff_t default_llseek(struct file *file, loff_t offset, int origin); -+ -+extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *)); -+extern int FASTCALL(path_init(const char *, unsigned, struct nameidata *)); -+extern int FASTCALL(path_walk(const char *, struct nameidata *)); -+extern int FASTCALL(path_lookup(const char *, unsigned, struct nameidata *)); -+extern int FASTCALL(link_path_walk(const char *, struct nameidata *)); -+extern void path_release(struct nameidata *); -+extern int follow_down(struct vfsmount **, struct dentry **); -+extern int follow_up(struct vfsmount **, struct dentry **); -+extern struct dentry * lookup_one_len(const char *, struct dentry *, int); -+extern struct dentry * lookup_hash(struct qstr *, struct dentry *); -+#define user_path_walk(name,nd) __user_walk(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd) -+#define user_path_walk_link(name,nd) __user_walk(name, LOOKUP_POSITIVE, nd) -+ -+extern void iput(struct inode *); -+extern void force_delete(struct inode *); -+extern struct inode * igrab(struct inode *); -+extern ino_t iunique(struct super_block *, ino_t); -+ -+typedef int (*find_inode_t)(struct inode *, unsigned long, void *); -+extern struct inode * iget4(struct super_block *, unsigned long, find_inode_t, void *); -+static inline struct inode *iget(struct super_block *sb, unsigned long ino) -+{ -+ return iget4(sb, ino, NULL, NULL); -+} -+ -+extern void clear_inode(struct inode *); -+extern struct inode * get_empty_inode(void); -+ -+static inline struct inode * new_inode(struct super_block *sb) -+{ -+ struct inode *inode = get_empty_inode(); -+ if (inode) { -+ inode->i_sb = sb; -+ inode->i_dev = sb->s_dev; -+ inode->i_blkbits = sb->s_blocksize_bits; -+ } -+ return inode; -+} -+extern void remove_suid(struct inode *inode); -+ -+extern void insert_inode_hash(struct inode *); -+extern void remove_inode_hash(struct inode *); -+extern struct file * get_empty_filp(void); -+extern void file_move(struct file *f, struct list_head *list); -+extern struct buffer_head * get_hash_table(kdev_t, int, int); -+extern struct buffer_head * getblk(kdev_t, int, int); -+extern void ll_rw_block(int, int, struct buffer_head * bh[]); -+extern void submit_bh(int, struct buffer_head *); -+extern int is_read_only(kdev_t); -+extern void __brelse(struct buffer_head *); -+static inline void brelse(struct buffer_head *buf) -+{ -+ if (buf) -+ __brelse(buf); -+} -+extern void __bforget(struct buffer_head *); -+static inline void bforget(struct buffer_head *buf) -+{ -+ if (buf) -+ __bforget(buf); -+} -+extern int set_blocksize(kdev_t, int); -+extern int sb_set_blocksize(struct super_block *, int); -+extern int sb_min_blocksize(struct super_block *, int); -+extern struct buffer_head * bread(kdev_t, int, int); -+static inline struct buffer_head * sb_bread(struct super_block *sb, int block) -+{ -+ return bread(sb->s_dev, block, sb->s_blocksize); -+} -+static inline struct buffer_head * sb_getblk(struct super_block *sb, int block) -+{ -+ return getblk(sb->s_dev, block, sb->s_blocksize); -+} -+static inline struct buffer_head * sb_get_hash_table(struct super_block *sb, int block) -+{ -+ return get_hash_table(sb->s_dev, block, sb->s_blocksize); -+} -+extern void wakeup_bdflush(void); -+extern void put_unused_buffer_head(struct buffer_head * bh); -+extern struct buffer_head * get_unused_buffer_head(int async); -+ -+extern int brw_page(int, struct page *, kdev_t, int [], int); -+ -+typedef int (get_block_t)(struct inode*,long,struct buffer_head*,int); -+ -+/* Generic buffer handling for block filesystems.. */ -+extern int try_to_release_page(struct page * page, int gfp_mask); -+extern int discard_bh_page(struct page *, unsigned long, int); -+#define block_flushpage(page, offset) discard_bh_page(page, offset, 1) -+#define block_invalidate_page(page) discard_bh_page(page, 0, 0) -+extern int block_symlink(struct inode *, const char *, int); -+extern int block_write_full_page(struct page*, get_block_t*); -+extern int block_read_full_page(struct page*, get_block_t*); -+extern int block_prepare_write(struct page*, unsigned, unsigned, get_block_t*); -+extern int cont_prepare_write(struct page*, unsigned, unsigned, get_block_t*, -+ unsigned long *); -+extern int generic_cont_expand(struct inode *inode, loff_t size) ; -+extern int block_commit_write(struct page *page, unsigned from, unsigned to); -+extern int block_sync_page(struct page *); -+ -+int generic_block_bmap(struct address_space *, long, get_block_t *); -+int generic_commit_write(struct file *, struct page *, unsigned, unsigned); -+int block_truncate_page(struct address_space *, loff_t, get_block_t *); -+extern int generic_direct_IO(int, struct inode *, struct kiobuf *, unsigned long, int, get_block_t *); -+extern int waitfor_one_page(struct page *); -+extern int writeout_one_page(struct page *); -+ -+extern int generic_file_mmap(struct file *, struct vm_area_struct *); -+extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size); -+extern ssize_t generic_file_read(struct file *, char *, size_t, loff_t *); -+extern ssize_t generic_file_write(struct file *, const char *, size_t, loff_t *); -+extern void do_generic_file_read(struct file *, loff_t *, read_descriptor_t *, read_actor_t); -+extern loff_t no_llseek(struct file *file, loff_t offset, int origin); -+extern loff_t generic_file_llseek(struct file *file, loff_t offset, int origin); -+extern ssize_t generic_read_dir(struct file *, char *, size_t, loff_t *); -+extern int generic_file_open(struct inode * inode, struct file * filp); -+ -+extern struct file_operations generic_ro_fops; -+ -+extern int vfs_readlink(struct dentry *, char *, int, const char *); -+extern int vfs_follow_link(struct nameidata *, const char *); -+extern int page_readlink(struct dentry *, char *, int); -+extern int page_follow_link(struct dentry *, struct nameidata *); -+extern struct inode_operations page_symlink_inode_operations; -+ -+extern int vfs_readdir(struct file *, filldir_t, void *); -+extern int dcache_dir_open(struct inode *, struct file *); -+extern int dcache_dir_close(struct inode *, struct file *); -+extern loff_t dcache_dir_lseek(struct file *, loff_t, int); -+extern int dcache_dir_fsync(struct file *, struct dentry *, int); -+extern int dcache_readdir(struct file *, void *, filldir_t); -+extern struct file_operations dcache_dir_ops; -+ -+extern struct file_system_type *get_fs_type(const char *name); -+extern struct super_block *get_super(kdev_t); -+extern void drop_super(struct super_block *sb); -+static inline int is_mounted(kdev_t dev) -+{ -+ struct super_block *sb = get_super(dev); -+ if (sb) { -+ drop_super(sb); -+ return 1; -+ } -+ return 0; -+} -+unsigned long generate_cluster(kdev_t, int b[], int); -+unsigned long generate_cluster_swab32(kdev_t, int b[], int); -+extern kdev_t ROOT_DEV; -+extern char root_device_name[]; -+ -+ -+extern void show_buffers(void); -+ -+#ifdef CONFIG_BLK_DEV_INITRD -+extern unsigned int real_root_dev; -+#endif -+ -+extern ssize_t char_read(struct file *, char *, size_t, loff_t *); -+extern ssize_t block_read(struct file *, char *, size_t, loff_t *); -+extern int read_ahead[]; -+ -+extern ssize_t char_write(struct file *, const char *, size_t, loff_t *); -+extern ssize_t block_write(struct file *, const char *, size_t, loff_t *); -+ -+extern int file_fsync(struct file *, struct dentry *, int); -+extern int generic_buffer_fdatasync(struct inode *inode, unsigned long start_idx, unsigned long end_idx); -+extern int generic_osync_inode(struct inode *, int); -+#define OSYNC_METADATA (1<<0) -+#define OSYNC_DATA (1<<1) -+#define OSYNC_INODE (1<<2) -+ -+extern int inode_change_ok(struct inode *, struct iattr *); -+extern int inode_setattr(struct inode *, struct iattr *); -+ -+/* -+ * Common dentry functions for inclusion in the VFS -+ * or in other stackable file systems. Some of these -+ * functions were in linux/fs/ C (VFS) files. -+ * -+ */ -+ -+/* -+ * Locking the parent is needed to: -+ * - serialize directory operations -+ * - make sure the parent doesn't change from -+ * under us in the middle of an operation. -+ * -+ * NOTE! Right now we'd rather use a "struct inode" -+ * for this, but as I expect things to move toward -+ * using dentries instead for most things it is -+ * probably better to start with the conceptually -+ * better interface of relying on a path of dentries. -+ */ -+static inline struct dentry *lock_parent(struct dentry *dentry) -+{ -+ struct dentry *dir = dget(dentry->d_parent); -+ -+ down(&dir->d_inode->i_sem); -+ return dir; -+} -+ -+static inline struct dentry *get_parent(struct dentry *dentry) -+{ -+ return dget(dentry->d_parent); -+} -+ -+static inline void unlock_dir(struct dentry *dir) -+{ -+ up(&dir->d_inode->i_sem); -+ dput(dir); -+} -+ -+/* -+ * Whee.. Deadlock country. Happily there are only two VFS -+ * operations that does this.. -+ */ -+static inline void double_down(struct semaphore *s1, struct semaphore *s2) -+{ -+ if (s1 != s2) { -+ if ((unsigned long) s1 < (unsigned long) s2) { -+ struct semaphore *tmp = s2; -+ s2 = s1; s1 = tmp; -+ } -+ down(s1); -+ } -+ down(s2); -+} -+ -+/* -+ * Ewwwwwwww... _triple_ lock. We are guaranteed that the 3rd argument is -+ * not equal to 1st and not equal to 2nd - the first case (target is parent of -+ * source) would be already caught, the second is plain impossible (target is -+ * its own parent and that case would be caught even earlier). Very messy. -+ * I _think_ that it works, but no warranties - please, look it through. -+ * Pox on bloody lusers who mandated overwriting rename() for directories... -+ */ -+ -+static inline void triple_down(struct semaphore *s1, -+ struct semaphore *s2, -+ struct semaphore *s3) -+{ -+ if (s1 != s2) { -+ if ((unsigned long) s1 < (unsigned long) s2) { -+ if ((unsigned long) s1 < (unsigned long) s3) { -+ struct semaphore *tmp = s3; -+ s3 = s1; s1 = tmp; -+ } -+ if ((unsigned long) s1 < (unsigned long) s2) { -+ struct semaphore *tmp = s2; -+ s2 = s1; s1 = tmp; -+ } -+ } else { -+ if ((unsigned long) s1 < (unsigned long) s3) { -+ struct semaphore *tmp = s3; -+ s3 = s1; s1 = tmp; -+ } -+ if ((unsigned long) s2 < (unsigned long) s3) { -+ struct semaphore *tmp = s3; -+ s3 = s2; s2 = tmp; -+ } -+ } -+ down(s1); -+ } else if ((unsigned long) s2 < (unsigned long) s3) { -+ struct semaphore *tmp = s3; -+ s3 = s2; s2 = tmp; -+ } -+ down(s2); -+ down(s3); -+} -+ -+static inline void double_up(struct semaphore *s1, struct semaphore *s2) -+{ -+ up(s1); -+ if (s1 != s2) -+ up(s2); -+} -+ -+static inline void triple_up(struct semaphore *s1, -+ struct semaphore *s2, -+ struct semaphore *s3) -+{ -+ up(s1); -+ if (s1 != s2) -+ up(s2); -+ up(s3); -+} -+ -+static inline void double_lock(struct dentry *d1, struct dentry *d2) -+{ -+ double_down(&d1->d_inode->i_sem, &d2->d_inode->i_sem); -+} -+ -+static inline void double_unlock(struct dentry *d1, struct dentry *d2) -+{ -+ double_up(&d1->d_inode->i_sem,&d2->d_inode->i_sem); -+ dput(d1); -+ dput(d2); -+} -+ -+#endif /* __KERNEL__ */ -+ -+#endif /* _LINUX_FS_H */ diff -Nurb src/linux/linux.orig/include/linux/squashfs_fs.h src/linux/linux/include/linux/squashfs_fs.h --- src/linux/linux.orig/include/linux/squashfs_fs.h 1969-12-31 19:00:00.000000000 -0500 +++ src/linux/linux/include/linux/squashfs_fs.h 2004-05-25 21:13:03.000000000 -0400 @@ -4116,1093 +2486,6 @@ diff -Nurb src/linux/linux.orig/init/do_mounts.c src/linux/linux/init/do_mounts. /* * Read block 1 to test for minix and ext2 superblock */ -diff -Nurb src/linux/linux.orig/init/do_mounts.c.orig src/linux/linux/init/do_mounts.c.orig ---- src/linux/linux.orig/init/do_mounts.c.orig 1969-12-31 19:00:00.000000000 -0500 -+++ src/linux/linux/init/do_mounts.c.orig 2004-05-25 21:12:42.000000000 -0400 -@@ -0,0 +1,1083 @@ -+#define __KERNEL_SYSCALLS__ -+#include <linux/config.h> -+#include <linux/slab.h> -+#include <linux/devfs_fs_kernel.h> -+#include <linux/unistd.h> -+#include <linux/ctype.h> -+#include <linux/blk.h> -+#include <linux/fd.h> -+#include <linux/tty.h> -+#include <linux/init.h> -+ -+#include <linux/nfs_fs.h> -+#include <linux/nfs_fs_sb.h> -+#include <linux/nfs_mount.h> -+#include <linux/minix_fs.h> -+#include <linux/ext2_fs.h> -+#include <linux/romfs_fs.h> -+#include <linux/cramfs_fs.h> -+#include <linux/squashfs_fs.h> -+ -+#undef BUILD_CRAMDISK -+ -+extern int get_filesystem_list(char * buf); -+ -+extern asmlinkage long sys_mount(char *dev_name, char *dir_name, char *type, -+ unsigned long flags, void *data); -+extern asmlinkage long sys_mkdir(const char *name, int mode); -+extern asmlinkage long sys_chdir(const char *name); -+extern asmlinkage long sys_fchdir(int fd); -+extern asmlinkage long sys_chroot(const char *name); -+extern asmlinkage long sys_unlink(const char *name); -+extern asmlinkage long sys_symlink(const char *old, const char *new); -+extern asmlinkage long sys_mknod(const char *name, int mode, dev_t dev); -+extern asmlinkage long sys_umount(char *name, int flags); -+extern asmlinkage long sys_ioctl(int fd, int cmd, unsigned long arg); -+ -+#ifdef CONFIG_BLK_DEV_INITRD -+unsigned int real_root_dev; /* do_proc_dointvec cannot handle kdev_t */ -+static int __initdata mount_initrd = 1; -+ -+static int __init no_initrd(char *str) -+{ -+ mount_initrd = 0; -+ return 1; -+} -+ -+__setup("noinitrd", no_initrd); -+#else -+static int __initdata mount_initrd = 0; -+#endif -+ -+int __initdata rd_doload; /* 1 = load RAM disk, 0 = don't load */ -+ -+int root_mountflags = MS_RDONLY | MS_VERBOSE; -+static char root_device_name[64]; -+ -+/* this is initialized in init/main.c */ -+kdev_t ROOT_DEV; -+ -+static int do_devfs = 0; -+ -+static int __init load_ramdisk(char *str) -+{ -+ rd_doload = simple_strtol(str,NULL,0) & 3; -+ return 1; -+} -+__setup("load_ramdisk=", load_ramdisk); -+ -+static int __init readonly(char *str) -+{ -+ if (*str) -+ return 0; -+ root_mountflags |= MS_RDONLY; -+ return 1; -+} -+ -+static int __init readwrite(char *str) -+{ -+ if (*str) -+ return 0; -+ root_mountflags &= ~MS_RDONLY; -+ return 1; -+} -+ -+__setup("ro", readonly); -+__setup("rw", readwrite); -+ -+static struct dev_name_struct { -+ const char *name; -+ const int num; -+} root_dev_names[] __initdata = { -+ { "nfs", 0x00ff }, -+ { "hda", 0x0300 }, -+ { "hdb", 0x0340 }, -+ { "loop", 0x0700 }, -+ { "hdc", 0x1600 }, -+ { "hdd", 0x1640 }, -+ { "hde", 0x2100 }, -+ { "hdf", 0x2140 }, -+ { "hdg", 0x2200 }, -+ { "hdh", 0x2240 }, -+ { "hdi", 0x3800 }, -+ { "hdj", 0x3840 }, -+ { "hdk", 0x3900 }, -+ { "hdl", 0x3940 }, -+ { "hdm", 0x5800 }, -+ { "hdn", 0x5840 }, -+ { "hdo", 0x5900 }, -+ { "hdp", 0x5940 }, -+ { "hdq", 0x5A00 }, -+ { "hdr", 0x5A40 }, -+ { "hds", 0x5B00 }, -+ { "hdt", 0x5B40 }, -+ { "sda", 0x0800 }, -+ { "sdb", 0x0810 }, -+ { "sdc", 0x0820 }, -+ { "sdd", 0x0830 }, -+ { "sde", 0x0840 }, -+ { "sdf", 0x0850 }, -+ { "sdg", 0x0860 }, -+ { "sdh", 0x0870 }, -+ { "sdi", 0x0880 }, -+ { "sdj", 0x0890 }, -+ { "sdk", 0x08a0 }, -+ { "sdl", 0x08b0 }, -+ { "sdm", 0x08c0 }, -+ { "sdn", 0x08d0 }, -+ { "sdo", 0x08e0 }, -+ { "sdp", 0x08f0 }, -+ { "ada", 0x1c00 }, -+ { "adb", 0x1c10 }, -+ { "adc", 0x1c20 }, -+ { "add", 0x1c30 }, -+ { "ade", 0x1c40 }, -+ { "fd", 0x0200 }, -+ { "md", 0x0900 }, -+ { "xda", 0x0d00 }, -+ { "xdb", 0x0d40 }, -+ { "ram", 0x0100 }, -+ { "scd", 0x0b00 }, -+ { "mcd", 0x1700 }, -+ { "cdu535", 0x1800 }, -+ { "sonycd", 0x1800 }, -+ { "aztcd", 0x1d00 }, -+ { "cm206cd", 0x2000 }, -+ { "gscd", 0x1000 }, -+ { "sbpcd", 0x1900 }, -+ { "eda", 0x2400 }, -+ { "edb", 0x2440 }, -+ { "pda", 0x2d00 }, -+ { "pdb", 0x2d10 }, -+ { "pdc", 0x2d20 }, -+ { "pdd", 0x2d30 }, -+ { "pcd", 0x2e00 }, -+ { "pf", 0x2f00 }, -+ { "apblock", APBLOCK_MAJOR << 8}, -+ { "ddv", DDV_MAJOR << 8}, -+ { "jsfd", JSFD_MAJOR << 8}, -+#if defined(CONFIG_ARCH_S390) -+ { "dasda", (DASD_MAJOR << MINORBITS) }, -+ { "dasdb", (DASD_MAJOR << MINORBITS) + (1 << 2) }, -+ { "dasdc", (DASD_MAJOR << MINORBITS) + (2 << 2) }, -+ { "dasdd", (DASD_MAJOR << MINORBITS) + (3 << 2) }, -+ { "dasde", (DASD_MAJOR << MINORBITS) + (4 << 2) }, -+ { "dasdf", (DASD_MAJOR << MINORBITS) + (5 << 2) }, -+ { "dasdg", (DASD_MAJOR << MINORBITS) + (6 << 2) }, -+ { "dasdh", (DASD_MAJOR << MINORBITS) + (7 << 2) }, -+#endif -+#if defined(CONFIG_BLK_CPQ_DA) || defined(CONFIG_BLK_CPQ_DA_MODULE) -+ { "ida/c0d0p",0x4800 }, -+ { "ida/c0d1p",0x4810 }, -+ { "ida/c0d2p",0x4820 }, -+ { "ida/c0d3p",0x4830 }, -+ { "ida/c0d4p",0x4840 }, -+ { "ida/c0d5p",0x4850 }, -+ { "ida/c0d6p",0x4860 }, -+ { "ida/c0d7p",0x4870 }, -+ { "ida/c0d8p",0x4880 }, -+ { "ida/c0d9p",0x4890 }, -+ { "ida/c0d10p",0x48A0 }, -+ { "ida/c0d11p",0x48B0 }, -+ { "ida/c0d12p",0x48C0 }, -+ { "ida/c0d13p",0x48D0 }, -+ { "ida/c0d14p",0x48E0 }, -+ { "ida/c0d15p",0x48F0 }, -+ { "ida/c1d0p",0x4900 }, -+ { "ida/c2d0p",0x4A00 }, -+ { "ida/c3d0p",0x4B00 }, -+ { "ida/c4d0p",0x4C00 }, -+ { "ida/c5d0p",0x4D00 }, -+ { "ida/c6d0p",0x4E00 }, -+ { "ida/c7d0p",0x4F00 }, -+#endif -+#if defined(CONFIG_BLK_CPQ_CISS_DA) || defined(CONFIG_BLK_CPQ_CISS_DA_MODULE) -+ { "cciss/c0d0p",0x6800 }, -+ { "cciss/c0d1p",0x6810 }, -+ { "cciss/c0d2p",0x6820 }, -+ { "cciss/c0d3p",0x6830 }, -+ { "cciss/c0d4p",0x6840 }, -+ { "cciss/c0d5p",0x6850 }, -+ { "cciss/c0d6p",0x6860 }, -+ { "cciss/c0d7p",0x6870 }, -+ { "cciss/c0d8p",0x6880 }, -+ { "cciss/c0d9p",0x6890 }, -+ { "cciss/c0d10p",0x68A0 }, -+ { "cciss/c0d11p",0x68B0 }, -+ { "cciss/c0d12p",0x68C0 }, -+ { "cciss/c0d13p",0x68D0 }, -+ { "cciss/c0d14p",0x68E0 }, -+ { "cciss/c0d15p",0x68F0 }, -+ { "cciss/c1d0p",0x6900 }, -+ { "cciss/c2d0p",0x6A00 }, -+ { "cciss/c3d0p",0x6B00 }, -+ { "cciss/c4d0p",0x6C00 }, -+ { "cciss/c5d0p",0x6D00 }, -+ { "cciss/c6d0p",0x6E00 }, -+ { "cciss/c7d0p",0x6F00 }, -+#endif -+ { "ataraid/d0p",0x7200 }, -+ { "ataraid/d1p",0x7210 }, -+ { "ataraid/d2p",0x7220 }, -+ { "ataraid/d3p",0x7230 }, -+ { "ataraid/d4p",0x7240 }, -+ { "ataraid/d5p",0x7250 }, -+ { "ataraid/d6p",0x7260 }, -+ { "ataraid/d7p",0x7270 }, -+ { "ataraid/d8p",0x7280 }, -+ { "ataraid/d9p",0x7290 }, -+ { "ataraid/d10p",0x72A0 }, -+ { "ataraid/d11p",0x72B0 }, -+ { "ataraid/d12p",0x72C0 }, -+ { "ataraid/d13p",0x72D0 }, -+ { "ataraid/d14p",0x72E0 }, -+ { "ataraid/d15p",0x72F0 }, -+ { "nftla", 0x5d00 }, -+ { "nftlb", 0x5d10 }, -+ { "nftlc", 0x5d20 }, -+ { "nftld", 0x5d30 }, -+ { "ftla", 0x2c00 }, -+ { "ftlb", 0x2c08 }, -+ { "ftlc", 0x2c10 }, -+ { "ftld", 0x2c18 }, -+#if defined(CONFIG_MTD_BLOCK) || defined(CONFIG_MTD_BLOCK_RO) -+ { "mtdblock", 0x1f00 }, -+ { "mtdblock0",0x1f00 }, -+ { "mtdblock1",0x1f01 }, -+ { "mtdblock2",0x1f02 }, -+ { "mtdblock3",0x1f03 }, -+#endif -+#ifdef CONFIG_BLK_DEV_DUMMY -+ { "dummy",0x2000 }, -+#endif -+ { NULL, 0 } -+}; -+ -+kdev_t __init name_to_kdev_t(char *line) -+{ -+ int base = 0, offs; -+ char *end; -+ -+ if (strncmp(line,"/dev/",5) == 0) { -+ struct dev_name_struct *dev = root_dev_names; -+ line += 5; -+ do { -+ int len = strlen(dev->name); -+ if (strncmp(line,dev->name,len) == 0) { -+ line += len; -+ base = dev->num; -+ break; -+ } -+ dev++; -+ } while (dev->name); -+ } -+ offs = simple_strtoul(line, &end, base?10:16); -+ if (*end) -+ offs = 0; -+ return to_kdev_t(base + offs); -+} -+ -+static int __init root_dev_setup(char *line) -+{ -+ int i; -+ char ch; -+ -+ ROOT_DEV = name_to_kdev_t(line); -+ memset (root_device_name, 0, sizeof root_device_name); -+ if (strncmp (line, "/dev/", 5) == 0) line += 5; -+ for (i = 0; i < sizeof root_device_name - 1; ++i) -+ { -+ ch = line[i]; -+ if ( isspace (ch) || (ch == ',') || (ch == '\0') ) break; -+ root_device_name[i] = ch; -+ } -+ return 1; -+} -+ -+__setup("root=", root_dev_setup); -+ -+static char * __initdata root_mount_data; -+static int __init root_data_setup(char *str) -+{ -+ root_mount_data = str; -+ return 1; -+} -+ -+static char * __initdata root_fs_names; -+static int __init fs_names_setup(char *str) -+{ -+ root_fs_names = str; -+ return 1; -+} -+ -+__setup("rootflags=", root_data_setup); -+__setup("rootfstype=", fs_names_setup); -+ -+static void __init get_fs_names(char *page) -+{ -+ char *s = page; -+ -+ if (root_fs_names) { -+ strcpy(page, root_fs_names); -+ while (*s++) { -+ if (s[-1] == ',') -+ s[-1] = '\0'; -+ } -+ } else { -+ int len = get_filesystem_list(page); -+ char *p, *next; -+ -+ page[len] = '\0'; -+ for (p = page-1; p; p = next) { -+ next = strchr(++p, '\n'); -+ if (*p++ != '\t') -+ continue; -+ while ((*s++ = *p++) != '\n') -+ ; -+ s[-1] = '\0'; -+ } -+ } -+ *s = '\0'; -+} -+static void __init mount_block_root(char *name, int flags) -+{ -+ char *fs_names = __getname(); -+ char *p; -+ -+ get_fs_names(fs_names); -+retry: -+ for (p = fs_names; *p; p += strlen(p)+1) { -+ int err = sys_mount(name, "/root", p, flags, root_mount_data); -+ switch (err) { -+ case 0: -+ goto out; -+ case -EACCES: -+ flags |= MS_RDONLY; -+ goto retry; -+ case -EINVAL: -+ continue; -+ } -+ /* -+ * Allow the user to distinguish between failed open -+ * and bad superblock on root device. -+ */ -+ printk ("VFS: Cannot open root device \"%s\" or %s\n", -+ root_device_name, kdevname (ROOT_DEV)); -+ printk ("Please append a correct \"root=\" boot option\n"); -+ panic("VFS: Unable to mount root fs on %s", -+ kdevname(ROOT_DEV)); -+ } -+ panic("VFS: Unable to mount root fs on %s", kdevname(ROOT_DEV)); -+out: -+ putname(fs_names); -+ sys_chdir("/root"); -+ ROOT_DEV = current->fs->pwdmnt->mnt_sb->s_dev; -+ printk("VFS: Mounted root (%s filesystem)%s.\n", -+ current->fs->pwdmnt->mnt_sb->s_type->name, -+ (current->fs->pwdmnt->mnt_sb->s_flags & MS_RDONLY) ? " readonly" : ""); -+} -+ -+#ifdef CONFIG_ROOT_NFS -+static int __init mount_nfs_root(void) -+{ -+ void *data = nfs_root_data(); -+ -+ if (data && sys_mount("/dev/root","/root","nfs",root_mountflags,data) == 0) -+ return 1; -+ return 0; -+} -+#endif -+ -+static int __init create_dev(char *name, kdev_t dev, char *devfs_name) -+{ -+ void *handle; -+ char path[64]; -+ int n; -+ -+ sys_unlink(name); -+ if (!do_devfs) -+ return sys_mknod(name, S_IFBLK|0600, kdev_t_to_nr(dev)); -+ -+ handle = devfs_find_handle(NULL, dev ? NULL : devfs_name, -+ MAJOR(dev), MINOR(dev), DEVFS_SPECIAL_BLK, 1); -+ if (!handle) -+ return -1; -+ n = devfs_generate_path(handle, path + 5, sizeof (path) - 5); -+ if (n < 0) -+ return -1; -+ return sys_symlink(path + n + 5, name); -+} -+ -+#if defined(CONFIG_BLK_DEV_RAM) || defined(CONFIG_BLK_DEV_FD) -+static void __init change_floppy(char *fmt, ...) -+{ -+ struct termios termios; -+ char buf[80]; -+ char c; -+ int fd; -+ va_list args; -+ va_start(args, fmt); -+ vsprintf(buf, fmt, args); -+ va_end(args); -+ fd = open("/dev/root", O_RDWR | O_NDELAY, 0); -+ if (fd >= 0) { -+ sys_ioctl(fd, FDEJECT, 0); -+ close(fd); -+ } -+ printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf); -+ fd = open("/dev/console", O_RDWR, 0); -+ if (fd >= 0) { -+ sys_ioctl(fd, TCGETS, (long)&termios); -+ termios.c_lflag &= ~ICANON; -+ sys_ioctl(fd, TCSETSF, (long)&termios); -+ read(fd, &c, 1); -+ termios.c_lflag |= ICANON; -+ sys_ioctl(fd, TCSETSF, (long)&termios); -+ close(fd); -+ } -+} -+#endif -+ -+#ifdef CONFIG_BLK_DEV_RAM -+ -+int __initdata rd_prompt = 1; /* 1 = prompt for RAM disk, 0 = don't prompt */ -+ -+static int __init prompt_ramdisk(char *str) -+{ -+ rd_prompt = simple_strtol(str,NULL,0) & 1; -+ return 1; -+} -+__setup("prompt_ramdisk=", prompt_ramdisk); -+ -+int __initdata rd_image_start; /* starting block # of image */ -+ -+static int __init ramdisk_start_setup(char *str) -+{ -+ rd_image_start = simple_strtol(str,NULL,0); -+ return 1; -+} -+__setup("ramdisk_start=", ramdisk_start_setup); -+ -+static int __init crd_load(int in_fd, int out_fd); -+ -+/* -+ * This routine tries to find a RAM disk image to load, and returns the -+ * number of blocks to read for a non-compressed image, 0 if the image -+ * is a compressed image, and -1 if an image with the right magic -+ * numbers could not be found. -+ * -+ * We currently check for the following magic numbers: -+ * minix -+ * ext2 -+ * romfs -+ * gzip -+ */ -+static int __init -+identify_ramdisk_image(int fd, int start_block) -+{ -+ const int size = 512; -+ struct minix_super_block *minixsb; -+ struct ext2_super_block *ext2sb; -+ struct romfs_super_block *romfsb; -+ struct cramfs_super *cramfsb; -+ struct squashfs_super_block *squashfsb; -+ int nblocks = -1; -+ unsigned char *buf; -+ -+ buf = kmalloc(size, GFP_KERNEL); -+ if (buf == 0) -+ return -1; -+ -+ minixsb = (struct minix_super_block *) buf; -+ ext2sb = (struct ext2_super_block *) buf; -+ romfsb = (struct romfs_super_block *) buf; -+ cramfsb = (struct cramfs_super *) buf; -+ squashfsb = (struct squashfs_super_block *) buf; -+ memset(buf, 0xe5, size); -+ -+ /* -+ * Read block 0 to test for gzipped kernel -+ */ -+ lseek(fd, start_block * BLOCK_SIZE, 0); -+ read(fd, buf, size); -+ -+ /* -+ * If it matches the gzip magic numbers, return -1 -+ */ -+ if (buf[0] == 037 && ((buf[1] == 0213) || (buf[1] == 0236))) { -+ printk(KERN_NOTICE -+ "RAMDISK: Compressed image found at block %d\n", -+ start_block); -+ nblocks = 0; -+ goto done; -+ } -+ -+#ifdef CONFIG_BLK_DEV_INITRD -+ /* -+ * Fallback if size cannot be determined by superblock -+ */ -+ nblocks = (initrd_end-initrd_start+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS; -+#endif -+ -+ /* romfs is at block zero too */ -+ if (romfsb->word0 == ROMSB_WORD0 && -+ romfsb->word1 == ROMSB_WORD1) { -+ printk(KERN_NOTICE -+ "RAMDISK: romfs filesystem found at block %d\n", -+ start_block); -+ nblocks = (ntohl(romfsb->size)+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS; -+ goto done; -+ } -+ -+ /* so is cramfs */ -+ if (cramfsb->magic == CRAMFS_MAGIC) { -+ printk(KERN_NOTICE -+ "RAMDISK: cramfs filesystem found at block %d\n", -+ start_block); -+ if (cramfsb->flags & CRAMFS_FLAG_FSID_VERSION_2) -+ nblocks = (cramfsb->size+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS; -+ goto done; -+ } -+ -+ /* -+ * Read block 1 to test for minix and ext2 superblock -+ */ -+ lseek(fd, (start_block+1) * BLOCK_SIZE, 0); -+ read(fd, buf, size); -+ -+ /* Try minix */ -+ if (minixsb->s_magic == MINIX_SUPER_MAGIC || -+ minixsb->s_magic == MINIX_SUPER_MAGIC2) { -+ printk(KERN_NOTICE -+ "RAMDISK: Minix filesystem found at block %d\n", -+ start_block); -+ nblocks = minixsb->s_nzones << minixsb->s_log_zone_size; -+ goto done; -+ } -+ -+ /* Try ext2 */ -+ if (ext2sb->s_magic == cpu_to_le16(EXT2_SUPER_MAGIC)) { -+ printk(KERN_NOTICE -+ "RAMDISK: ext2 filesystem found at block %d\n", -+ start_block); -+ nblocks = le32_to_cpu(ext2sb->s_blocks_count); -+ goto done; -+ } -+ -+ printk(KERN_NOTICE -+ "RAMDISK: Couldn't find valid RAM disk image starting at %d.\n", -+ start_block); -+ nblocks = -1; -+ -+done: -+ lseek(fd, start_block * BLOCK_SIZE, 0); -+ kfree(buf); -+ return nblocks; -+} -+#endif -+ -+static int __init rd_load_image(char *from) -+{ -+ int res = 0; -+ -+#ifdef CONFIG_BLK_DEV_RAM -+ int in_fd, out_fd; -+ unsigned long rd_blocks, devblocks; -+ int nblocks, i; -+ char *buf; -+ unsigned short rotate = 0; -+#if !defined(CONFIG_ARCH_S390) && !defined(CONFIG_PPC_ISERIES) -+ char rotator[4] = { '|' , '/' , '-' , '\\' }; -+#endif -+ -+ out_fd = open("/dev/ram", O_RDWR, 0); -+ if (out_fd < 0) -+ goto out; -+ -+ in_fd = open(from, O_RDONLY, 0); -+ if (in_fd < 0) -+ goto noclose_input; -+ -+ nblocks = identify_ramdisk_image(in_fd, rd_image_start); -+ if (nblocks < 0) -+ goto done; -+ -+ if (nblocks == 0) { -+#ifdef BUILD_CRAMDISK -+ if (crd_load(in_fd, out_fd) == 0) -+ goto successful_load; -+#else -+ printk(KERN_NOTICE -+ "RAMDISK: Kernel does not support compressed " -+ "RAM disk images\n"); -+#endif -+ goto done; -+ } -+ -+ /* -+ * NOTE NOTE: nblocks suppose that the blocksize is BLOCK_SIZE, so -+ * rd_load_image will work only with filesystem BLOCK_SIZE wide! -+ * So make sure to use 1k blocksize while generating ext2fs -+ * ramdisk-images. -+ */ -+ if (sys_ioctl(out_fd, BLKGETSIZE, (unsigned long)&rd_blocks) < 0) -+ rd_blocks = 0; -+ else -+ rd_blocks >>= 1; -+ -+ if (nblocks > rd_blocks) { -+ printk("RAMDISK: image too big! (%d/%d blocks)\n", -+ nblocks, rd_blocks); -+ goto done; -+ } -+ -+ /* -+ * OK, time to copy in the data -+ */ -+ buf = kmalloc(BLOCK_SIZE, GFP_KERNEL); -+ if (buf == 0) { -+ printk(KERN_ERR "RAMDISK: could not allocate buffer\n"); -+ goto done; -+ } -+ -+ if (sys_ioctl(in_fd, BLKGETSIZE, (unsigned long)&devblocks) < 0) -+ devblocks = 0; -+ else -+ devblocks >>= 1; -+ -+ if (strcmp(from, "/dev/initrd") == 0) -+ devblocks = nblocks; -+ -+ if (devblocks == 0) { -+ printk(KERN_ERR "RAMDISK: could not determine device size\n"); -+ goto done; -+ } -+ -+ printk(KERN_NOTICE "RAMDISK: Loading %d blocks [%d disk%s] into ram disk... ", -+ nblocks, ((nblocks-1)/devblocks)+1, nblocks>devblocks ? "s" : ""); -+ for (i=0; i < nblocks; i++) { -+ if (i && (i % devblocks == 0)) { -+ printk("done disk #%d.\n", i/devblocks); -+ rotate = 0; -+ if (close(in_fd)) { -+ printk("Error closing the disk.\n"); -+ goto noclose_input; -+ } -+ change_floppy("disk #%d", i/devblocks+1); -+ in_fd = open(from, O_RDONLY, 0); -+ if (in_fd < 0) { -+ printk("Error opening disk.\n"); -+ goto noclose_input; -+ } -+ printk("Loading disk #%d... ", i/devblocks+1); -+ } -+ read(in_fd, buf, BLOCK_SIZE); -+ write(out_fd, buf, BLOCK_SIZE); -+#if !defined(CONFIG_ARCH_S390) && !defined(CONFIG_PPC_ISERIES) -+ if (!(i % 16)) { -+ printk("%c\b", rotator[rotate & 0x3]); -+ rotate++; -+ } -+#endif -+ } -+ printk("done.\n"); -+ kfree(buf); -+ -+successful_load: -+ res = 1; -+done: -+ close(in_fd); -+noclose_input: -+ close(out_fd); -+out: -+ sys_unlink("/dev/ram"); -+#endif -+ return res; -+} -+ -+static int __init rd_load_disk(int n) -+{ -+#ifdef CONFIG_BLK_DEV_RAM -+ if (rd_prompt) -+ change_floppy("root floppy disk to be loaded into RAM disk"); -+ create_dev("/dev/ram", MKDEV(RAMDISK_MAJOR, n), NULL); -+#endif -+ return rd_load_image("/dev/root"); -+} -+ -+#ifdef CONFIG_DEVFS_FS -+ -+static void __init convert_name(char *prefix, char *name, char *p, int part) -+{ -+ int host, bus, target, lun; -+ char dest[64]; -+ char src[64]; -+ char *base = p - 1; -+ -+ /* Decode "c#b#t#u#" */ -+ if (*p++ != 'c') -+ return; -+ host = simple_strtol(p, &p, 10); -+ if (*p++ != 'b') -+ return; -+ bus = simple_strtol(p, &p, 10); -+ if (*p++ != 't') -+ return; -+ target = simple_strtol(p, &p, 10); -+ if (*p++ != 'u') -+ return; -+ lun = simple_strtol(p, &p, 10); -+ if (!part) -+ sprintf(dest, "%s/host%d/bus%d/target%d/lun%d", -+ prefix, host, bus, target, lun); -+ else if (*p++ == 'p') -+ sprintf(dest, "%s/host%d/bus%d/target%d/lun%d/part%s", -+ prefix, host, bus, target, lun, p); -+ else -+ sprintf(dest, "%s/host%d/bus%d/target%d/lun%d/disc", -+ prefix, host, bus, target, lun); -+ *base = '\0'; -+ sprintf(src, "/dev/%s", name); -+ sys_mkdir(src, 0755); -+ *base = '/'; -+ sprintf(src, "/dev/%s", name); -+ sys_symlink(dest, src); -+} -+ -+static void __init devfs_make_root(char *name) -+{ -+ -+ if (!strncmp(name, "sd/", 3)) -+ convert_name("../scsi", name, name+3, 1); -+ else if (!strncmp(name, "sr/", 3)) -+ convert_name("../scsi", name, name+3, 0); -+ else if (!strncmp(name, "ide/hd/", 7)) -+ convert_name("..", name, name + 7, 1); -+ else if (!strncmp(name, "ide/cd/", 7)) -+ convert_name("..", name, name + 7, 0); -+} -+#else -+static void __init devfs_make_root(char *name) -+{ -+} -+#endif -+ -+static void __init mount_root(void) -+{ -+#ifdef CONFIG_ROOT_NFS -+ if (MAJOR(ROOT_DEV) == UNNAMED_MAJOR) { -+ if (mount_nfs_root()) { -+ sys_chdir("/root"); -+ ROOT_DEV = current->fs->pwdmnt->mnt_sb->s_dev; -+ printk("VFS: Mounted root (nfs filesystem).\n"); -+ return; -+ } -+ printk(KERN_ERR "VFS: Unable to mount root fs via NFS, trying floppy.\n"); -+ ROOT_DEV = MKDEV(FLOPPY_MAJOR, 0); -+ } -+#endif -+ devfs_make_root(root_device_name); -+ create_dev("/dev/root", ROOT_DEV, root_device_name); -+#ifdef CONFIG_BLK_DEV_FD -+ if (MAJOR(ROOT_DEV) == FLOPPY_MAJOR) { -+ /* rd_doload is 2 for a dual initrd/ramload setup */ -+ if (rd_doload==2) { -+ if (rd_load_disk(1)) { -+ ROOT_DEV = MKDEV(RAMDISK_MAJOR, 1); -+ create_dev("/dev/root", ROOT_DEV, NULL); -+ } -+ } else -+ change_floppy("root floppy"); -+ } -+#endif -+#if defined(CONFIG_MTD_BLOCK) || defined(CONFIG_MTD_BLOCK_RO) -+ if (MAJOR(ROOT_DEV) == 31) { -+ /* rd_doload is for a ramload setup */ -+ if (rd_doload) { -+ if (rd_load_disk(0)) { -+ ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0); -+ create_dev("/dev/root", ROOT_DEV, NULL); -+ } -+ } -+ } -+#endif -+ mount_block_root("/dev/root", root_mountflags); -+} -+ -+#ifdef CONFIG_BLK_DEV_INITRD -+static int old_fd, root_fd; -+static int do_linuxrc(void * shell) -+{ -+ static char *argv[] = { "linuxrc", NULL, }; -+ extern char * envp_init[]; -+ -+ close(old_fd); -+ close(root_fd); -+ close(0); -+ close(1); -+ close(2); -+ setsid(); -+ (void) open("/dev/console",O_RDWR,0); -+ (void) dup(0); -+ (void) dup(0); -+ return execve(shell, argv, envp_init); -+} -+ -+#endif -+ -+static void __init handle_initrd(void) -+{ -+#ifdef CONFIG_BLK_DEV_INITRD -+ int ram0 = kdev_t_to_nr(MKDEV(RAMDISK_MAJOR,0)); -+ int error; -+ int i, pid; -+ -+ create_dev("/dev/root.old", ram0, NULL); -+ /* mount initrd on rootfs' /root */ -+ mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY); -+ sys_mkdir("/old", 0700); -+ root_fd = open("/", 0, 0); -+ old_fd = open("/old", 0, 0); -+ /* move initrd over / and chdir/chroot in initrd root */ -+ sys_chdir("/root"); -+ sys_mount(".", "/", NULL, MS_MOVE, NULL); -+ sys_chroot("."); -+ mount_devfs_fs (); -+ -+ pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD); -+ if (pid > 0) { -+ while (pid != wait(&i)) -+ yield(); -+ } -+ -+ /* move initrd to rootfs' /old */ -+ sys_fchdir(old_fd); -+ sys_mount("/", ".", NULL, MS_MOVE, NULL); -+ /* switch root and cwd back to / of rootfs */ -+ sys_fchdir(root_fd); -+ sys_chroot("."); -+ sys_umount("/old/dev", 0); -+ -+ if (real_root_dev == ram0) { -+ sys_chdir("/old"); -+ return; -+ } -+ -+ ROOT_DEV = real_root_dev; -+ mount_root(); -+ -+ printk(KERN_NOTICE "Trying to move old root to /initrd ... "); -+ error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL); -+ if (!error) -+ printk("okay\n"); -+ else { -+ int fd = open("/dev/root.old", O_RDWR, 0); -+ printk("failed\n"); -+ printk(KERN_NOTICE "Unmounting old root\n"); -+ sys_umount("/old", MNT_DETACH); -+ printk(KERN_NOTICE "Trying to free ramdisk memory ... "); -+ if (fd < 0) { -+ error = fd; -+ } else { -+ error = sys_ioctl(fd, BLKFLSBUF, 0); -+ close(fd); -+ } -+ printk(!error ? "okay\n" : "failed\n"); -+ } -+#endif -+} -+ -+static int __init initrd_load(void) -+{ -+#ifdef CONFIG_BLK_DEV_INITRD -+ create_dev("/dev/ram", MKDEV(RAMDISK_MAJOR, 0), NULL); -+ create_dev("/dev/initrd", MKDEV(RAMDISK_MAJOR, INITRD_MINOR), NULL); -+#endif -+ return rd_load_image("/dev/initrd"); -+} -+ -+/* -+ * Prepare the namespace - decide what/where to mount, load ramdisks, etc. -+ */ -+void prepare_namespace(void) -+{ -+ int is_floppy = MAJOR(ROOT_DEV) == FLOPPY_MAJOR; -+#ifdef CONFIG_ALL_PPC -+ extern void arch_discover_root(void); -+ arch_discover_root(); -+#endif /* CONFIG_ALL_PPC */ -+#ifdef CONFIG_BLK_DEV_INITRD -+ if (!initrd_start) -+ mount_initrd = 0; -+ real_root_dev = ROOT_DEV; -+#endif -+ sys_mkdir("/dev", 0700); -+ sys_mkdir("/root", 0700); -+ sys_mknod("/dev/console", S_IFCHR|0600, MKDEV(TTYAUX_MAJOR, 1)); -+#ifdef CONFIG_DEVFS_FS -+ sys_mount("devfs", "/dev", "devfs", 0, NULL); -+ do_devfs = 1; -+#endif -+ -+ create_dev("/dev/root", ROOT_DEV, NULL); -+ if (mount_initrd) { -+ if (initrd_load() && ROOT_DEV != MKDEV(RAMDISK_MAJOR, 0)) { -+ handle_initrd(); -+ goto out; -+ } -+ } else if (is_floppy && rd_doload && rd_load_disk(0)) -+ ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0); -+ mount_root(); -+out: -+ sys_umount("/dev", 0); -+ sys_mount(".", "/", NULL, MS_MOVE, NULL); -+ sys_chroot("."); -+ mount_devfs_fs (); -+} -+ -+#if defined(BUILD_CRAMDISK) && defined(CONFIG_BLK_DEV_RAM) -+ -+/* -+ * gzip declarations -+ */ -+ -+#define OF(args) args -+ -+#ifndef memzero -+#define memzero(s, n) memset ((s), 0, (n)) -+#endif -+ -+typedef unsigned char uch; -+typedef unsigned short ush; -+typedef unsigned long ulg; -+ -+#define INBUFSIZ 4096 -+#define WSIZE 0x8000 /* window size--must be a power of two, and */ -+ /* at least 32K for zip's deflate method */ -+ -+static uch *inbuf; -+static uch *window; -+ -+static unsigned insize; /* valid bytes in inbuf */ -+static unsigned inptr; /* index of next byte to be processed in inbuf */ -+static unsigned outcnt; /* bytes in output buffer */ -+static int exit_code; -+static long bytes_out; -+static int crd_infd, crd_outfd; -+ -+#define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf()) -+ -+/* Diagnostic functions (stubbed out) */ -+#define Assert(cond,msg) -+#define Trace(x) -+#define Tracev(x) -+#define Tracevv(x) -+#define Tracec(c,x) -+#define Tracecv(c,x) -+ -+#define STATIC static -+ -+static int fill_inbuf(void); -+static void flush_window(void); -+static void *malloc(int size); -+static void free(void *where); -+static void error(char *m); -+static void gzip_mark(void **); -+static void gzip_release(void **); -+ -+#include "../lib/inflate.c" -+ -+static void __init *malloc(int size) -+{ -+ return kmalloc(size, GFP_KERNEL); -+} -+ -+static void __init free(void *where) -+{ -+ kfree(where); -+} -+ -+static void __init gzip_mark(void **ptr) -+{ -+} -+ -+static void __init gzip_release(void **ptr) -+{ -+} -+ -+ -+/* =========================================================================== -+ * Fill the input buffer. This is called only when the buffer is empty -+ * and at least one byte is really needed. -+ */ -+static int __init fill_inbuf(void) -+{ -+ if (exit_code) return -1; -+ -+ insize = read(crd_infd, inbuf, INBUFSIZ); -+ if (insize == 0) return -1; -+ -+ inptr = 1; -+ -+ return inbuf[0]; -+} -+ -+/* =========================================================================== -+ * Write the output window window[0..outcnt-1] and update crc and bytes_out. -+ * (Used for the decompressed data only.) -+ */ -+static void __init flush_window(void) -+{ -+ ulg c = crc; /* temporary variable */ -+ unsigned n; -+ uch *in, ch; -+ -+ write(crd_outfd, window, outcnt); -+ in = window; -+ for (n = 0; n < outcnt; n++) { -+ ch = *in++; -+ c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8); -+ } -+ crc = c; -+ bytes_out += (ulg)outcnt; -+ outcnt = 0; -+} -+ -+static void __init error(char *x) -+{ -+ printk(KERN_ERR "%s", x); -+ exit_code = 1; -+} -+ -+static int __init crd_load(int in_fd, int out_fd) -+{ -+ int result; -+ -+ insize = 0; /* valid bytes in inbuf */ -+ inptr = 0; /* index of next byte to be processed in inbuf */ -+ outcnt = 0; /* bytes in output buffer */ -+ exit_code = 0; -+ bytes_out = 0; -+ crc = (ulg)0xffffffffL; /* shift register contents */ -+ -+ crd_infd = in_fd; -+ crd_outfd = out_fd; -+ inbuf = kmalloc(INBUFSIZ, GFP_KERNEL); -+ if (inbuf == 0) { -+ printk(KERN_ERR "RAMDISK: Couldn't allocate gzip buffer\n"); -+ return -1; -+ } -+ window = kmalloc(WSIZE, GFP_KERNEL); -+ if (window == 0) { -+ printk(KERN_ERR "RAMDISK: Couldn't allocate gzip window\n"); -+ kfree(inbuf); -+ return -1; -+ } -+ makecrc(); -+ result = gunzip(); -+ kfree(inbuf); -+ kfree(window); -+ return result; -+} -+ -+#endif /* BUILD_CRAMDISK && CONFIG_BLK_DEV_RAM */ diff -Nurb src/linux/linux.orig/kernel/ksyms.c src/linux/linux/kernel/ksyms.c --- src/linux/linux.orig/kernel/ksyms.c 2003-07-04 04:12:28.000000000 -0400 +++ src/linux/linux/kernel/ksyms.c 2004-05-25 21:12:24.000000000 -0400 |