Merge branch 'block-2.6.24' of git://git.kernel.dk/data/git/linux-2.6-block

* 'block-2.6.24' of git://git.kernel.dk/data/git/linux-2.6-block: (37 commits)
  [BLOCK] Fix failing compile with BLK_DEV_IO_TRACE=n
  compat_ioctl: move floppy handlers to block/compat_ioctl.c
  compat_ioctl: move cdrom handlers to block/compat_ioctl.c
  compat_ioctl: move BLKPG handling to block/compat_ioctl.c
  compat_ioctl: move hdio calls to block/compat_ioctl.c
  compat_ioctl: handle blk_trace ioctls
  compat_ioctl: add compat_blkdev_driver_ioctl()
  compat_ioctl: move common block ioctls to compat_blkdev_ioctl
  Sysace: Don't enable IRQ until after interrupt handler is registered
  Sysace: sparse fixes
  Sysace: Minor coding convention fixup
  drivers/block/umem: use DRIVER_NAME where appropriate
  drivers/block/umem: trim trailing whitespace
  drivers/block/umem: minor cleanups
  drivers/block/umem: use dev_printk()
  drivers/block/umem: move private include away from include/linux
  Sysace: Labels in C code should not be indented.
  Sysace: Add of_platform_bus binding
  Sysace: Move IRQ handler registration to occur after FSM is initialized
  Sysace: minor rework and cleanup changes
  ...

7 files changed, 39 insertions, 150 deletions

diff --git a/include/linux/bio.h b/include/linux/bio.h
index 1ddef34f43c3..089a8bc55dd4 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -64,7 +64,7 @@ struct bio_vec {
 
 struct bio_set;
 struct bio;
-typedef int (bio_end_io_t) (struct bio *, unsigned int, int);
+typedef void (bio_end_io_t) (struct bio *, int);
 typedef void (bio_destructor_t) (struct bio *);
 
 /*
@@ -226,7 +226,7 @@ struct bio {
 #define BIO_SEG_BOUNDARY(q, b1, b2) \
         BIOVEC_SEG_BOUNDARY((q), __BVEC_END((b1)), __BVEC_START((b2)))
 
-#define bio_io_error(bio, bytes) bio_endio((bio), (bytes), -EIO)
+#define bio_io_error(bio) bio_endio((bio), -EIO)
 
 /*
  * drivers should not use the __ version unless they _really_ want to
@@ -286,7 +286,7 @@ extern struct bio *bio_alloc_bioset(gfp_t, int, struct bio_set *);
 extern void bio_put(struct bio *);
 extern void bio_free(struct bio *, struct bio_set *);
 
-extern void bio_endio(struct bio *, unsigned int, int);
+extern void bio_endio(struct bio *, int);
 struct request_queue;
 extern int bio_phys_segments(struct request_queue *, struct bio *);
 extern int bio_hw_segments(struct request_queue *, struct bio *);
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index b126c6f68e27..95be0ac57e76 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_BLKDEV_H
 #define _LINUX_BLKDEV_H
 
+#ifdef CONFIG_BLOCK
+
 #include <linux/sched.h>
 #include <linux/major.h>
 #include <linux/genhd.h>
@@ -32,8 +34,6 @@
 )
 #endif
 
-#ifdef CONFIG_BLOCK
-
 struct scsi_ioctl_command;
 
 struct request_queue;
@@ -471,7 +471,6 @@ struct request_queue
         int                     orderr, ordcolor;
         struct request          pre_flush_rq, bar_rq, post_flush_rq;
         struct request          *orig_bar_rq;
-        unsigned int            bi_size;
 
         struct mutex            sysfs_lock;
 
@@ -637,10 +636,23 @@ static inline void blk_queue_bounce(struct request_queue *q, struct bio **bio)
 }
 #endif /* CONFIG_MMU */
 
-#define rq_for_each_bio(_bio, rq)       \
+struct req_iterator {
+        int i;
+        struct bio *bio;
+};
+
+/* This should not be used directly - use rq_for_each_segment */
+#define __rq_for_each_bio(_bio, rq)     \
         if ((rq->bio))                  \
                 for (_bio = (rq)->bio; _bio; _bio = _bio->bi_next)
 
+#define rq_for_each_segment(bvl, _rq, _iter)                    \
+        __rq_for_each_bio(_iter.bio, _rq)                       \
+                bio_for_each_segment(bvl, _iter.bio, _iter.i)
+
+#define rq_iter_last(rq, _iter)                                 \
+                (_iter.bio->bi_next == NULL && _iter.i == _iter.bio->bi_vcnt-1)
+
 extern int blk_register_queue(struct gendisk *disk);
 extern void blk_unregister_queue(struct gendisk *disk);
 extern void register_disk(struct gendisk *dev);
@@ -662,8 +674,8 @@ extern int sg_scsi_ioctl(struct file *, struct request_queue *,
 /*
  * Temporary export, until SCSI gets fixed up.
  */
-extern int ll_back_merge_fn(struct request_queue *, struct request *,
-                struct bio *);
+extern int blk_rq_append_bio(struct request_queue *q, struct request *rq,
+                             struct bio *bio);
 
 /*
  * A queue has just exitted congestion.  Note this in the global counter of
@@ -810,7 +822,6 @@ static inline struct request *blk_map_queue_find_tag(struct blk_queue_tag *bqt,
         return bqt->tag_index[tag];
 }
 
-extern void blk_rq_bio_prep(struct request_queue *, struct request *, struct bio *);
 extern int blkdev_issue_flush(struct block_device *, sector_t *);
 
 #define MAX_PHYS_SEGMENTS 128
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index 7b5d56b82b59..2e105a12fe29 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -142,10 +142,14 @@ struct blk_user_trace_setup {
         u32 pid;
 };
 
+#ifdef __KERNEL__
 #if defined(CONFIG_BLK_DEV_IO_TRACE)
 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
 extern void blk_trace_shutdown(struct request_queue *);
 extern void __blk_add_trace(struct blk_trace *, sector_t, int, int, u32, int, int, void *);
+extern int do_blk_trace_setup(struct request_queue *q,
+        struct block_device *bdev, struct blk_user_trace_setup *buts);
+
 
 /**
  * blk_add_trace_rq - Add a trace for a request oriented action
@@ -286,6 +290,12 @@ static inline void blk_add_trace_remap(struct request_queue *q, struct bio *bio,
 #define blk_add_trace_generic(q, rq, rw, what)  do { } while (0)
 #define blk_add_trace_pdu_int(q, what, bio, pdu)        do { } while (0)
 #define blk_add_trace_remap(q, bio, dev, f, t)  do {} while (0)
+static inline int do_blk_trace_setup(struct request_queue *q,
+                                     struct block_device *bdev,
+                                     struct blk_user_trace_setup *buts)
+{
+        return 0;
+}
 #endif /* CONFIG_BLK_DEV_IO_TRACE */
-
+#endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index c8636bb3e3a7..cfee06bca2d3 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1738,6 +1738,11 @@
 
 #define PCI_VENDOR_ID_RADISYS           0x1331
 
+#define PCI_VENDOR_ID_MICRO_MEMORY              0x1332
+#define PCI_DEVICE_ID_MICRO_MEMORY_5415CN       0x5415
+#define PCI_DEVICE_ID_MICRO_MEMORY_5425CN       0x5425
+#define PCI_DEVICE_ID_MICRO_MEMORY_6155         0x6155
+
 #define PCI_VENDOR_ID_DOMEX             0x134a
 #define PCI_DEVICE_ID_DOMEX_DMX3191D    0x0001
 
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 665f85f2a3af..edf681a7fd8f 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -221,7 +221,7 @@ extern void swap_unplug_io_fn(struct backing_dev_info *, struct page *);
 /* linux/mm/page_io.c */
 extern int swap_readpage(struct file *, struct page *);
 extern int swap_writepage(struct page *page, struct writeback_control *wbc);
-extern int end_swap_bio_read(struct bio *bio, unsigned int bytes_done, int err);
+extern void end_swap_bio_read(struct bio *bio, int err);
 
 /* linux/mm/swap_state.c */
 extern struct address_space swapper_space;
diff --git a/include/linux/umem.h b/include/linux/umem.h
deleted file mode 100644
index f36ebfc32bf6..000000000000
--- a/include/linux/umem.h
+++ /dev/null
@@ -1,138 +0,0 @@
-
-/*
- * This file contains defines for the
- *   Micro Memory MM5415
- * family PCI Memory Module with Battery Backup.
- *
- * Copyright Micro Memory INC 2001.  All rights reserved.
- * Release under the terms of the GNU GENERAL PUBLIC LICENSE version 2.
- * See the file COPYING.
- */
-
-#ifndef _DRIVERS_BLOCK_MM_H
-#define _DRIVERS_BLOCK_MM_H
-
-
-#define IRQ_TIMEOUT (1 * HZ)
-
-/* CSR register definition */
-#define MEMCTRLSTATUS_MAGIC     0x00
-#define  MM_MAGIC_VALUE         (unsigned char)0x59
-
-#define MEMCTRLSTATUS_BATTERY   0x04
-#define  BATTERY_1_DISABLED     0x01
-#define  BATTERY_1_FAILURE      0x02
-#define  BATTERY_2_DISABLED     0x04
-#define  BATTERY_2_FAILURE      0x08
-
-#define MEMCTRLSTATUS_MEMORY    0x07
-#define  MEM_128_MB             0xfe
-#define  MEM_256_MB             0xfc
-#define  MEM_512_MB             0xf8
-#define  MEM_1_GB               0xf0
-#define  MEM_2_GB               0xe0
-
-#define MEMCTRLCMD_LEDCTRL      0x08
-#define  LED_REMOVE             2
-#define  LED_FAULT              4
-#define  LED_POWER              6
-#define  LED_FLIP               255
-#define  LED_OFF                0x00
-#define  LED_ON                 0x01
-#define  LED_FLASH_3_5          0x02
-#define  LED_FLASH_7_0          0x03
-#define  LED_POWER_ON           0x00
-#define  LED_POWER_OFF          0x01
-#define  USER_BIT1              0x01
-#define  USER_BIT2              0x02
-
-#define MEMORY_INITIALIZED      USER_BIT1
-
-#define MEMCTRLCMD_ERRCTRL      0x0C
-#define  EDC_NONE_DEFAULT       0x00
-#define  EDC_NONE               0x01
-#define  EDC_STORE_READ         0x02
-#define  EDC_STORE_CORRECT      0x03
-
-#define MEMCTRLCMD_ERRCNT       0x0D
-#define MEMCTRLCMD_ERRSTATUS    0x0E
-
-#define ERROR_DATA_LOG          0x20
-#define ERROR_ADDR_LOG          0x28
-#define ERROR_COUNT             0x3D
-#define ERROR_SYNDROME          0x3E
-#define ERROR_CHECK             0x3F
-
-#define DMA_PCI_ADDR            0x40
-#define DMA_LOCAL_ADDR          0x48
-#define DMA_TRANSFER_SIZE       0x50
-#define DMA_DESCRIPTOR_ADDR     0x58
-#define DMA_SEMAPHORE_ADDR      0x60
-#define DMA_STATUS_CTRL         0x68
-#define  DMASCR_GO              0x00001
-#define  DMASCR_TRANSFER_READ   0x00002
-#define  DMASCR_CHAIN_EN        0x00004
-#define  DMASCR_SEM_EN          0x00010
-#define  DMASCR_DMA_COMP_EN     0x00020
-#define  DMASCR_CHAIN_COMP_EN   0x00040
-#define  DMASCR_ERR_INT_EN      0x00080
-#define  DMASCR_PARITY_INT_EN   0x00100
-#define  DMASCR_ANY_ERR         0x00800
-#define  DMASCR_MBE_ERR         0x01000
-#define  DMASCR_PARITY_ERR_REP  0x02000
-#define  DMASCR_PARITY_ERR_DET  0x04000
-#define  DMASCR_SYSTEM_ERR_SIG  0x08000
-#define  DMASCR_TARGET_ABT      0x10000
-#define  DMASCR_MASTER_ABT      0x20000
-#define  DMASCR_DMA_COMPLETE    0x40000
-#define  DMASCR_CHAIN_COMPLETE  0x80000
-
-/* 
-3.SOME PCs HAVE HOST BRIDGES WHICH APPARENTLY DO NOT CORRECTLY HANDLE 
-READ-LINE (0xE) OR READ-MULTIPLE (0xC) PCI COMMAND CODES DURING DMA 
-TRANSFERS. IN OTHER SYSTEMS THESE COMMAND CODES WILL CAUSE THE HOST BRIDGE 
-TO ALLOW LONGER BURSTS DURING DMA READ OPERATIONS. THE UPPER FOUR BITS 
-(31..28) OF THE DMA CSR HAVE BEEN MADE PROGRAMMABLE, SO THAT EITHER A 0x6, 
-AN 0xE OR A 0xC CAN BE WRITTEN TO THEM TO SET THE COMMAND CODE USED DURING 
-DMA READ OPERATIONS.
-*/
-#define        DMASCR_READ   0x60000000
-#define        DMASCR_READLINE   0xE0000000
-#define        DMASCR_READMULTI   0xC0000000
-
-
-#define DMASCR_ERROR_MASK       (DMASCR_MASTER_ABT | DMASCR_TARGET_ABT | DMASCR_SYSTEM_ERR_SIG | DMASCR_PARITY_ERR_DET | DMASCR_MBE_ERR | DMASCR_ANY_ERR)
-#define DMASCR_HARD_ERROR       (DMASCR_MASTER_ABT | DMASCR_TARGET_ABT | DMASCR_SYSTEM_ERR_SIG | DMASCR_PARITY_ERR_DET | DMASCR_MBE_ERR)
-
-#define WINDOWMAP_WINNUM        0x7B
-
-#define DMA_READ_FROM_HOST 0
-#define DMA_WRITE_TO_HOST 1
-
-struct mm_dma_desc {
-        __le64  pci_addr;
-        __le64  local_addr;
-        __le32  transfer_size;
-        u32     zero1;
-        __le64  next_desc_addr;
-        __le64  sem_addr;
-        __le32  control_bits;
-        u32     zero2;
-
-        dma_addr_t data_dma_handle;
-
-        /* Copy of the bits */
-        __le64  sem_control_bits;
-} __attribute__((aligned(8)));
-
-#define PCI_VENDOR_ID_MICRO_MEMORY              0x1332
-#define PCI_DEVICE_ID_MICRO_MEMORY_5415CN       0x5415
-#define PCI_DEVICE_ID_MICRO_MEMORY_5425CN       0x5425
-#define PCI_DEVICE_ID_MICRO_MEMORY_6155         0x6155
-
-/* bits for card->flags */
-#define UM_FLAG_DMA_IN_REGS             1
-#define UM_FLAG_NO_BYTE_STATUS          2
-#define UM_FLAG_NO_BATTREG              4
-#define UM_FLAG_NO_BATT                 8
-#endif
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index b4af6bcb7b7a..c7c3337c3a88 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -5,6 +5,7 @@
 #define WRITEBACK_H
 
 #include <linux/sched.h>
+#include <linux/fs.h>
 
 struct backing_dev_info;