v2.4.9.1 -> v2.4.9.2

  - Al Viro: block device cleanups
  - Marcelo Tosatti: make bounce buffer allocations more robust (it's ok
  for them to do IO, just not cause recursive bounce IO. So allow them)
  - Anton Altaparmakov: NTFS update (1.1.17)
  - Paul Mackerras: PPC update (big re-org)
  - Petko Manolov: USB pegasus driver fixes
  - David Miller: networking and sparc updates
  - Trond Myklebust: Export atomic_dec_and_lock
  - OGAWA Hirofumi: find and fix umsdos "filldir" users that were broken
  by the 64-bit-cleanups. Fix msdos warnings.
  - Al Viro: superblock handling cleanups and race fixes
  - Johannes Erdfelt++: USB updates

9 files changed, 51 insertions, 19 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 574c6377c97d..8d70498784f5 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -89,12 +89,7 @@ extern int leases_enable, dir_notify_enable, lease_break_time;
 #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;
-			   * kernel-wide vfsmnt is placed in ->kern_mnt by
-			   * kern_mount() which must be called _after_
-			   * register_filesystem().
-			   */
+#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
@@ -665,6 +660,7 @@ 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;
@@ -688,6 +684,7 @@ struct super_block {
 	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 {
@@ -913,8 +910,8 @@ struct file_system_type {
 	int fs_flags;
 	struct super_block *(*read_super) (struct super_block *, void *, int);
 	struct module *owner;
-	struct vfsmount *kern_mnt; /* For kernel mount, if it's FS_SINGLE fs */
 	struct file_system_type * next;
+	struct list_head fs_supers;
 };
 
 #define DECLARE_FSTYPE(var,type,read,flags) \
@@ -1147,7 +1144,7 @@ static inline void mark_buffer_dirty_inode(struct buffer_head *bh, struct inode
 	buffer_insert_inode_queue(bh, inode);
 }
 
-extern void balance_dirty(kdev_t);
+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);
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index b9fc98184d11..ea28234bd480 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -10,6 +10,7 @@
 #include <stdarg.h>
 #include <linux/linkage.h>
 #include <linux/stddef.h>
+#include <linux/types.h>
 
 /* Optimization barrier */
 /* The "volatile" is due to gcc bugs */
@@ -61,6 +62,8 @@ extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
 extern long long simple_strtoll(const char *,char **,unsigned int);
 extern int sprintf(char * buf, const char * fmt, ...);
 extern int vsprintf(char *buf, const char *, va_list);
+extern int snprintf(char * buf, size_t size, const char *fmt, ...);
+extern int vsnprintf(char *buf, size_t size, const char *fmt, va_list args);
 extern int get_option(char **str, int *pint);
 extern char *get_options(char *str, int nints, int *ints);
 extern unsigned long long memparse(char *ptr, char **retptr);
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 48b8dbd14a3c..d4464136cbe7 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -536,17 +536,20 @@ extern struct page *filemap_nopage(struct vm_area_struct *, unsigned long, int);
 /* Action modifiers - doesn't change the zoning */
 #define __GFP_WAIT	0x10	/* Can wait and reschedule? */
 #define __GFP_HIGH	0x20	/* Should access emergency pools? */
-#define __GFP_IO	0x40	/* Can start physical IO? */
-#define __GFP_FS	0x80	/* Can call down to low-level FS? */
+#define __GFP_IO	0x40	/* Can start low memory physical IO? */
+#define __GFP_HIGHIO	0x80	/* Can start high mem physical IO? */
+#define __GFP_FS	0x100	/* Can call down to low-level FS? */
 
+#define GFP_NOHIGHIO	(__GFP_HIGH | __GFP_WAIT | __GFP_IO)
 #define GFP_NOIO	(__GFP_HIGH | __GFP_WAIT)
-#define GFP_NOFS	(__GFP_HIGH | __GFP_WAIT | __GFP_IO)
+#define GFP_NOFS	(__GFP_HIGH | __GFP_WAIT | __GFP_IO | __GFP_HIGHIO)
 #define GFP_ATOMIC	(__GFP_HIGH)
-#define GFP_USER	(             __GFP_WAIT | __GFP_IO | __GFP_FS)
-#define GFP_HIGHUSER	(             __GFP_WAIT | __GFP_IO | __GFP_FS | __GFP_HIGHMEM)
-#define GFP_KERNEL	(__GFP_HIGH | __GFP_WAIT | __GFP_IO | __GFP_FS)
-#define GFP_NFS		(__GFP_HIGH | __GFP_WAIT | __GFP_IO | __GFP_FS)
-#define GFP_KSWAPD	(                          __GFP_IO | __GFP_FS)
+#define GFP_USER	(             __GFP_WAIT | __GFP_IO | __GFP_HIGHIO | __GFP_FS)
+#define GFP_HIGHUSER	(             __GFP_WAIT | __GFP_IO | __GFP_HIGHIO \
+	       	| __GFP_FS | __GFP_HIGHMEM)
+#define GFP_KERNEL	(__GFP_HIGH | __GFP_WAIT | __GFP_IO | __GFP_HIGHIO | __GFP_FS)
+#define GFP_NFS	(__GFP_HIGH | __GFP_WAIT | __GFP_IO | __GFP_HIGHIO | __GFP_FS)
+#define GFP_KSWAPD	(                          __GFP_IO | __GFP_HIGHIO | __GFP_FS)
 
 /* Flag - indicates that the buffer will be suitable for DMA.  Ignored on some
    platforms, used as appropriate on others */
diff --git a/include/linux/ntfs_fs.h b/include/linux/ntfs_fs.h
index 7b30dd7b0174..cbb865d7b31c 100644
--- a/include/linux/ntfs_fs.h
+++ b/include/linux/ntfs_fs.h
@@ -1,3 +1,21 @@
 #ifndef _LINUX_NTFS_FS_H
 #define _LINUX_NTFS_FS_H
+
+#include <asm/byteorder.h>
+
+#define NTFS_SECTOR_BITS 9
+#define NTFS_SECTOR_SIZE 512
+
+/*
+ * Attribute flags (16-bit).
+ */
+typedef enum {
+	ATTR_IS_COMPRESSED      = cpu_to_le16(0x0001),
+	ATTR_COMPRESSION_MASK   = cpu_to_le16(0x00ff),  /* Compression method
+							 * mask. Also, first
+							 * illegal value. */
+	ATTR_IS_ENCRYPTED       = cpu_to_le16(0x4000),
+	ATTR_IS_SPARSE          = cpu_to_le16(0x8000),
+} __attribute__ ((__packed__)) ATTR_FLAGS;
+
 #endif
diff --git a/include/linux/ntfs_fs_i.h b/include/linux/ntfs_fs_i.h
index 263aa1a9da45..c532168a9b4f 100644
--- a/include/linux/ntfs_fs_i.h
+++ b/include/linux/ntfs_fs_i.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_NTFS_FS_I_H
 #define _LINUX_NTFS_FS_I_H
 
+#include <linux/types.h>
+
 /* Forward declarations, to keep number of mutual includes low */
 struct ntfs_attribute;
 struct ntfs_sb_info;
diff --git a/include/linux/ntfs_fs_sb.h b/include/linux/ntfs_fs_sb.h
index 6181604ff0e8..e55da3cdec0f 100644
--- a/include/linux/ntfs_fs_sb.h
+++ b/include/linux/ntfs_fs_sb.h
@@ -1,7 +1,7 @@
 #ifndef _LINUX_NTFS_FS_SB_H
 #define _LINUX_NTFS_FS_SB_H
 
-typedef __s64 LCN;
+#include <linux/ntfs_fs_i.h>
 
 struct ntfs_sb_info{
 	/* Configuration provided by user at mount time. */
@@ -10,6 +10,8 @@ struct ntfs_sb_info{
 	ntmode_t umask;
 	void *nls_map;
 	unsigned int ngt;
+	char mft_zone_multiplier;
+	ntfs_cluster_t mft_zone_end;
 	/* Configuration provided by user with the ntfstools.
 	 * FIXME: This is no longer possible. What is this good for? (AIA) */
 	ntfs_size_t partition_bias;	/* For access to underlying device. */
@@ -36,7 +38,9 @@ struct ntfs_sb_info{
 	int index_clusters_per_record;
 	int index_record_size;
 	int index_record_size_bits;
-	LCN mft_lcn;
+	ntfs_cluster_t nr_clusters;
+	ntfs_cluster_t mft_lcn;
+	ntfs_cluster_t mft_mirr_lcn;
 	/* Data read from special files. */
 	unsigned char *mft;
 	unsigned short *upcase;
diff --git a/include/linux/slab.h b/include/linux/slab.h
index e70bf400632c..d5ec05fef003 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -17,13 +17,14 @@ typedef struct kmem_cache_s kmem_cache_t;
 /* flags for kmem_cache_alloc() */
 #define	SLAB_NOFS		GFP_NOFS
 #define	SLAB_NOIO		GFP_NOIO
+#define SLAB_NOHIGHIO		GFP_NOHIGHIO
 #define	SLAB_ATOMIC		GFP_ATOMIC
 #define	SLAB_USER		GFP_USER
 #define	SLAB_KERNEL		GFP_KERNEL
 #define	SLAB_NFS		GFP_NFS
 #define	SLAB_DMA		GFP_DMA
 
-#define SLAB_LEVEL_MASK		(__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS)
+#define SLAB_LEVEL_MASK		(__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_HIGHIO|__GFP_FS)
 #define	SLAB_NO_GROW		0x00001000UL	/* don't grow a cache */
 
 /* flags to pass to kmem_cache_create().
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index add4ca9d28b1..413f196ad4d2 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -281,6 +281,8 @@ enum
 	NET_TCP_APP_WIN=86,
 	NET_TCP_ADV_WIN_SCALE=87,
 	NET_IPV4_NONLOCAL_BIND=88,
+	NET_IPV4_ICMP_RATELIMIT=89,
+	NET_IPV4_ICMP_RATEMASK=90
 };
 
 enum {
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index f24e4de6b9ac..0241b41fdc9e 100644
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -8,6 +8,7 @@
 
 #include <linux/config.h>
 #include <linux/vt.h>
+#include <linux/kd.h>
 
 /*
  * Presently, a lot of graphics programs do not restore the contents of
@@ -31,6 +32,7 @@ extern struct vt_struct {
 } *vt_cons[MAX_NR_CONSOLES];
 
 extern void (*kd_mksound)(unsigned int hz, unsigned int ticks);
+extern int (*kbd_rate)(struct kbd_repeat *rep);
 
 /* console.c */