v2.4.1.2 -> v2.4.1.3

  - Jens: better ordering of requests when unable to merge
  - Neil Brown: make md work as a module again (we cannot autodetect
  in modules, not enough background information)
  - Neil Brown: raid5 SMP locking cleanups
  - Neil Brown: nfsd: handle Irix NFS clients named pipe behavior and
  dentry leak fix
  - maestro3 shutdown fix
  - fix dcache hash calculation that could cause bad hashes under certain
  circumstances (Dean Gaudet)
  - David Miller: networking and sparc updates
  - Jeff Garzik: include file cleanups
  - Andy Grover: ACPI update
  - Coda-fs error return fixes
  - rth: alpha Jensen update

15 files changed, 16 insertions, 17 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index d0aac4c7d15a..fa5eae623488 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -34,7 +34,7 @@
 #include <linux/ioport.h>
 #include <linux/locks.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/reboot.h>
 #include <linux/spinlock.h>
diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c
index fd3101f7f802..d9a09e3a274b 100644
--- a/drivers/block/acsi.c
+++ b/drivers/block/acsi.c
@@ -59,7 +59,7 @@
 #include <linux/mm.h>
 #include <linux/major.h>
 #include <linux/blk.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <scsi/scsi.h> /* for SCSI_IOCTL_GET_IDLUN */
 typedef void Scsi_Device; /* hack to avoid including scsi.h */
diff --git a/drivers/block/acsi_slm.c b/drivers/block/acsi_slm.c
index 35bab96feb18..6dadacb4d45e 100644
--- a/drivers/block/acsi_slm.c
+++ b/drivers/block/acsi_slm.c
@@ -64,7 +64,7 @@ not be guaranteed. There are several ways to assure this:
 #include <linux/interrupt.h>
 #include <linux/time.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/smp_lock.h>
 
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 9f0d031a877f..4d7c512f4d71 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -74,7 +74,7 @@
 #include <linux/types.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 
 #include <asm/setup.h>
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 4dde72c33133..c02092272523 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -26,7 +26,7 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/major.h>
 #include <linux/fs.h>
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 427236c30718..b190e8ae7737 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -28,7 +28,7 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/major.h>
 #include <linux/fs.h>
diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
index de569c7de2d0..352986d04634 100644
--- a/drivers/block/cpqarray.h
+++ b/drivers/block/cpqarray.h
@@ -28,7 +28,7 @@
 #ifdef __KERNEL__
 #include <linux/blkdev.h>
 #include <linux/locks.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/timer.h>
 #endif
diff --git a/drivers/block/elevator.c b/drivers/block/elevator.c
index 9917ad055a6d..3df8aab7f497 100644
--- a/drivers/block/elevator.c
+++ b/drivers/block/elevator.c
@@ -46,6 +46,8 @@ int elevator_linus_merge(request_queue_t *q, struct request **req,
 			break;
 		}
 
+		if (!*req && BHRQ_IN_ORDER(bh, __rq))
+			*req = __rq;
 		if (__rq->sem)
 			continue;
 		if (__rq->cmd != rw)
@@ -65,8 +67,7 @@ int elevator_linus_merge(request_queue_t *q, struct request **req,
 			__rq->elevator_sequence -= count;
 			*req = __rq;
 			break;
-		} else if (!*req && BHRQ_IN_ORDER(bh, __rq))
-			*req = __rq;
+		}
 	}
 
 	return ret;
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 613841745fbc..4e569fa9f90b 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -152,7 +152,7 @@ static int print_unex=1;
 #include <linux/hdreg.h>
 
 #include <linux/errno.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/fcntl.h>
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index 5e8ba90530f2..dfcfbab096cf 100644
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -576,8 +576,6 @@ inline void drive_stat_acct (kdev_t dev, int rw,
 static inline void add_request(request_queue_t * q, struct request * req,
 			       struct list_head *insert_here)
 {
-	int major;
-
 	drive_stat_acct(req->rq_dev, req->cmd, req->nr_sectors, 1);
 
 	if (!q->plugged && q->head_active && insert_here == &q->queue_head) {
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 969147a35168..956d460427bd 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -75,7 +75,7 @@
 #define TIMEOUT_VALUE (6 * HZ)
 #include <linux/blk.h>
 
-#include <linux/malloc.h>
+#include <linux/slab.h>
 static int max_loop = 8;
 static struct loop_device *loop_dev;
 static int *loop_sizes;
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 914bfa23cfb3..916cfb7470fc 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -167,7 +167,7 @@ static int pg_drive_count;
 #include <linux/devfs_fs_kernel.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/mtio.h>
 #include <linux/pg.h>
 #include <linux/wait.h>
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index c5dbb73ad64a..870c6bc18325 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -146,7 +146,7 @@ static int pt_drive_count;
 #include <linux/devfs_fs_kernel.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/mtio.h>
 #include <linux/wait.h>
 #include <linux/smp_lock.h>
diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 1799ccef536e..503913bf3228 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -53,7 +53,7 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/ioctl.h>
 #include <linux/fd.h>
 #include <linux/module.h>
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index 5aedc25439e8..c6ef9788489b 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -28,7 +28,7 @@
 #define MAJOR_NR    Z2RAM_MAJOR
 
 #include <linux/major.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/blk.h>
 #include <linux/init.h>