Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

9 files changed, 994 insertions, 236 deletions

diff --git a/block/Kconfig b/block/Kconfig
index 2484e0e9d89c..9bda7bc80307 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -64,4 +64,9 @@ config BLK_DEV_BSG
 
 endif # BLOCK
 
+config BLOCK_COMPAT
+        bool
+        depends on BLOCK && COMPAT
+        default y
+
 source block/Kconfig.iosched
diff --git a/block/Makefile b/block/Makefile
index 959feeb253be..826108190f00 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -11,3 +11,4 @@ obj-$(CONFIG_IOSCHED_DEADLINE)	+= deadline-iosched.o
 obj-$(CONFIG_IOSCHED_CFQ)       += cfq-iosched.o
 
 obj-$(CONFIG_BLK_DEV_IO_TRACE)  += blktrace.o
+obj-$(CONFIG_BLOCK_COMPAT)      += compat_ioctl.o
diff --git a/block/blktrace.c b/block/blktrace.c
index 20fa034ea4a2..775471ef84a5 100644
--- a/block/blktrace.c
+++ b/block/blktrace.c
@@ -312,33 +312,26 @@ static struct rchan_callbacks blk_relay_callbacks = {
 /*
  * Setup everything required to start tracing
  */
-static int blk_trace_setup(struct request_queue *q, struct block_device *bdev,
-                           char __user *arg)
+int do_blk_trace_setup(struct request_queue *q, struct block_device *bdev,
+                        struct blk_user_trace_setup *buts)
 {
-        struct blk_user_trace_setup buts;
         struct blk_trace *old_bt, *bt = NULL;
         struct dentry *dir = NULL;
         char b[BDEVNAME_SIZE];
         int ret, i;
 
-        if (copy_from_user(&buts, arg, sizeof(buts)))
-                return -EFAULT;
-
-        if (!buts.buf_size || !buts.buf_nr)
+        if (!buts->buf_size || !buts->buf_nr)
                 return -EINVAL;
 
-        strcpy(buts.name, bdevname(bdev, b));
+        strcpy(buts->name, bdevname(bdev, b));
 
         /*
          * some device names have larger paths - convert the slashes
          * to underscores for this to work as expected
          */
-        for (i = 0; i < strlen(buts.name); i++)
-                if (buts.name[i] == '/')
-                        buts.name[i] = '_';
-
-        if (copy_to_user(arg, &buts, sizeof(buts)))
-                return -EFAULT;
+        for (i = 0; i < strlen(buts->name); i++)
+                if (buts->name[i] == '/')
+                        buts->name[i] = '_';
 
         ret = -ENOMEM;
         bt = kzalloc(sizeof(*bt), GFP_KERNEL);
@@ -350,7 +343,7 @@ static int blk_trace_setup(struct request_queue *q, struct block_device *bdev,
                 goto err;
 
         ret = -ENOENT;
-        dir = blk_create_tree(buts.name);
+        dir = blk_create_tree(buts->name);
         if (!dir)
                 goto err;
 
@@ -363,20 +356,21 @@ static int blk_trace_setup(struct request_queue *q, struct block_device *bdev,
         if (!bt->dropped_file)
                 goto err;
 
-        bt->rchan = relay_open("trace", dir, buts.buf_size, buts.buf_nr, &blk_relay_callbacks, bt);
+        bt->rchan = relay_open("trace", dir, buts->buf_size,
+                                buts->buf_nr, &blk_relay_callbacks, bt);
         if (!bt->rchan)
                 goto err;
 
-        bt->act_mask = buts.act_mask;
+        bt->act_mask = buts->act_mask;
         if (!bt->act_mask)
                 bt->act_mask = (u16) -1;
 
-        bt->start_lba = buts.start_lba;
-        bt->end_lba = buts.end_lba;
+        bt->start_lba = buts->start_lba;
+        bt->end_lba = buts->end_lba;
         if (!bt->end_lba)
                 bt->end_lba = -1ULL;
 
-        bt->pid = buts.pid;
+        bt->pid = buts->pid;
         bt->trace_state = Blktrace_setup;
 
         ret = -EBUSY;
@@ -401,6 +395,26 @@ err:
         return ret;
 }
 
+static int blk_trace_setup(struct request_queue *q, struct block_device *bdev,
+                           char __user *arg)
+{
+        struct blk_user_trace_setup buts;
+        int ret;
+
+        ret = copy_from_user(&buts, arg, sizeof(buts));
+        if (ret)
+                return -EFAULT;
+
+        ret = do_blk_trace_setup(q, bdev, &buts);
+        if (ret)
+                return ret;
+
+        if (copy_to_user(arg, &buts, sizeof(buts)))
+                return -EFAULT;
+
+        return 0;
+}
+
 static int blk_trace_startstop(struct request_queue *q, int start)
 {
         struct blk_trace *bt;
diff --git a/block/bsg.c b/block/bsg.c
index ed2646827234..b8ddfc66f210 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -1010,10 +1010,7 @@ unlock:
 }
 EXPORT_SYMBOL_GPL(bsg_register_queue);
 
-static struct cdev bsg_cdev = {
-        .kobj   = {.name = "bsg", },
-        .owner  = THIS_MODULE,
-};
+static struct cdev bsg_cdev;
 
 static int __init bsg_init(void)
 {
diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
new file mode 100644
index 000000000000..f84093b97f70
--- /dev/null
+++ b/block/compat_ioctl.c
@@ -0,0 +1,814 @@
+#include <linux/blkdev.h>
+#include <linux/blkpg.h>
+#include <linux/blktrace_api.h>
+#include <linux/cdrom.h>
+#include <linux/compat.h>
+#include <linux/elevator.h>
+#include <linux/fd.h>
+#include <linux/hdreg.h>
+#include <linux/syscalls.h>
+#include <linux/smp_lock.h>
+#include <linux/types.h>
+#include <linux/uaccess.h>
+
+static int compat_put_ushort(unsigned long arg, unsigned short val)
+{
+        return put_user(val, (unsigned short __user *)compat_ptr(arg));
+}
+
+static int compat_put_int(unsigned long arg, int val)
+{
+        return put_user(val, (compat_int_t __user *)compat_ptr(arg));
+}
+
+static int compat_put_long(unsigned long arg, long val)
+{
+        return put_user(val, (compat_long_t __user *)compat_ptr(arg));
+}
+
+static int compat_put_ulong(unsigned long arg, compat_ulong_t val)
+{
+        return put_user(val, (compat_ulong_t __user *)compat_ptr(arg));
+}
+
+static int compat_put_u64(unsigned long arg, u64 val)
+{
+        return put_user(val, (compat_u64 __user *)compat_ptr(arg));
+}
+
+struct compat_hd_geometry {
+        unsigned char heads;
+        unsigned char sectors;
+        unsigned short cylinders;
+        u32 start;
+};
+
+static int compat_hdio_getgeo(struct gendisk *disk, struct block_device *bdev,
+                        struct compat_hd_geometry __user *ugeo)
+{
+        struct hd_geometry geo;
+        int ret;
+
+        if (!ugeo)
+                return -EINVAL;
+        if (!disk->fops->getgeo)
+                return -ENOTTY;
+
+        /*
+         * We need to set the startsect first, the driver may
+         * want to override it.
+         */
+        geo.start = get_start_sect(bdev);
+        ret = disk->fops->getgeo(bdev, &geo);
+        if (ret)
+                return ret;
+
+        ret = copy_to_user(ugeo, &geo, 4);
+        ret |= __put_user(geo.start, &ugeo->start);
+        if (ret)
+                ret = -EFAULT;
+
+        return ret;
+}
+
+static int compat_hdio_ioctl(struct inode *inode, struct file *file,
+                struct gendisk *disk, unsigned int cmd, unsigned long arg)
+{
+        mm_segment_t old_fs = get_fs();
+        unsigned long kval;
+        unsigned int __user *uvp;
+        int error;
+
+        set_fs(KERNEL_DS);
+        error = blkdev_driver_ioctl(inode, file, disk,
+                                cmd, (unsigned long)(&kval));
+        set_fs(old_fs);
+
+        if (error == 0) {
+                uvp = compat_ptr(arg);
+                if (put_user(kval, uvp))
+                        error = -EFAULT;
+        }
+        return error;
+}
+
+struct compat_cdrom_read_audio {
+        union cdrom_addr        addr;
+        u8                      addr_format;
+        compat_int_t            nframes;
+        compat_caddr_t          buf;
+};
+
+struct compat_cdrom_generic_command {
+        unsigned char   cmd[CDROM_PACKET_SIZE];
+        compat_caddr_t  buffer;
+        compat_uint_t   buflen;
+        compat_int_t    stat;
+        compat_caddr_t  sense;
+        unsigned char   data_direction;
+        compat_int_t    quiet;
+        compat_int_t    timeout;
+        compat_caddr_t  reserved[1];
+};
+
+static int compat_cdrom_read_audio(struct inode *inode, struct file *file,
+                struct gendisk *disk, unsigned int cmd, unsigned long arg)
+{
+        struct cdrom_read_audio __user *cdread_audio;
+        struct compat_cdrom_read_audio __user *cdread_audio32;
+        __u32 data;
+        void __user *datap;
+
+        cdread_audio = compat_alloc_user_space(sizeof(*cdread_audio));
+        cdread_audio32 = compat_ptr(arg);
+
+        if (copy_in_user(&cdread_audio->addr,
+                         &cdread_audio32->addr,
+                         (sizeof(*cdread_audio32) -
+                          sizeof(compat_caddr_t))))
+                return -EFAULT;
+
+        if (get_user(data, &cdread_audio32->buf))
+                return -EFAULT;
+        datap = compat_ptr(data);
+        if (put_user(datap, &cdread_audio->buf))
+                return -EFAULT;
+
+        return blkdev_driver_ioctl(inode, file, disk, cmd,
+                        (unsigned long)cdread_audio);
+}
+
+static int compat_cdrom_generic_command(struct inode *inode, struct file *file,
+                struct gendisk *disk, unsigned int cmd, unsigned long arg)
+{
+        struct cdrom_generic_command __user *cgc;
+        struct compat_cdrom_generic_command __user *cgc32;
+        u32 data;
+        unsigned char dir;
+        int itmp;
+
+        cgc = compat_alloc_user_space(sizeof(*cgc));
+        cgc32 = compat_ptr(arg);
+
+        if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
+            get_user(data, &cgc32->buffer) ||
+            put_user(compat_ptr(data), &cgc->buffer) ||
+            copy_in_user(&cgc->buflen, &cgc32->buflen,
+                         (sizeof(unsigned int) + sizeof(int))) ||
+            get_user(data, &cgc32->sense) ||
+            put_user(compat_ptr(data), &cgc->sense) ||
+            get_user(dir, &cgc32->data_direction) ||
+            put_user(dir, &cgc->data_direction) ||
+            get_user(itmp, &cgc32->quiet) ||
+            put_user(itmp, &cgc->quiet) ||
+            get_user(itmp, &cgc32->timeout) ||
+            put_user(itmp, &cgc->timeout) ||
+            get_user(data, &cgc32->reserved[0]) ||
+            put_user(compat_ptr(data), &cgc->reserved[0]))
+                return -EFAULT;
+
+        return blkdev_driver_ioctl(inode, file, disk, cmd, (unsigned long)cgc);
+}
+
+struct compat_blkpg_ioctl_arg {
+        compat_int_t op;
+        compat_int_t flags;
+        compat_int_t datalen;
+        compat_caddr_t data;
+};
+
+static int compat_blkpg_ioctl(struct inode *inode, struct file *file,
+                unsigned int cmd, struct compat_blkpg_ioctl_arg __user *ua32)
+{
+        struct blkpg_ioctl_arg __user *a = compat_alloc_user_space(sizeof(*a));
+        compat_caddr_t udata;
+        compat_int_t n;
+        int err;
+
+        err = get_user(n, &ua32->op);
+        err |= put_user(n, &a->op);
+        err |= get_user(n, &ua32->flags);
+        err |= put_user(n, &a->flags);
+        err |= get_user(n, &ua32->datalen);
+        err |= put_user(n, &a->datalen);
+        err |= get_user(udata, &ua32->data);
+        err |= put_user(compat_ptr(udata), &a->data);
+        if (err)
+                return err;
+
+        return blkdev_ioctl(inode, file, cmd, (unsigned long)a);
+}
+
+#define BLKBSZGET_32            _IOR(0x12, 112, int)
+#define BLKBSZSET_32            _IOW(0x12, 113, int)
+#define BLKGETSIZE64_32         _IOR(0x12, 114, int)
+
+struct compat_floppy_struct {
+        compat_uint_t   size;
+        compat_uint_t   sect;
+        compat_uint_t   head;
+        compat_uint_t   track;
+        compat_uint_t   stretch;
+        unsigned char   gap;
+        unsigned char   rate;
+        unsigned char   spec1;
+        unsigned char   fmt_gap;
+        const compat_caddr_t name;
+};
+
+struct compat_floppy_drive_params {
+        char            cmos;
+        compat_ulong_t  max_dtr;
+        compat_ulong_t  hlt;
+        compat_ulong_t  hut;
+        compat_ulong_t  srt;
+        compat_ulong_t  spinup;
+        compat_ulong_t  spindown;
+        unsigned char   spindown_offset;
+        unsigned char   select_delay;
+        unsigned char   rps;
+        unsigned char   tracks;
+        compat_ulong_t  timeout;
+        unsigned char   interleave_sect;
+        struct floppy_max_errors max_errors;
+        char            flags;
+        char            read_track;
+        short           autodetect[8];
+        compat_int_t    checkfreq;
+        compat_int_t    native_format;
+};
+
+struct compat_floppy_drive_struct {
+        signed char     flags;
+        compat_ulong_t  spinup_date;
+        compat_ulong_t  select_date;
+        compat_ulong_t  first_read_date;
+        short           probed_format;
+        short           track;
+        short           maxblock;
+        short           maxtrack;
+        compat_int_t    generation;
+        compat_int_t    keep_data;
+        compat_int_t    fd_ref;
+        compat_int_t    fd_device;
+        compat_int_t    last_checked;
+        compat_caddr_t dmabuf;
+        compat_int_t    bufblocks;
+};
+
+struct compat_floppy_fdc_state {
+        compat_int_t    spec1;
+        compat_int_t    spec2;
+        compat_int_t    dtr;
+        unsigned char   version;
+        unsigned char   dor;
+        compat_ulong_t  address;
+        unsigned int    rawcmd:2;
+        unsigned int    reset:1;
+        unsigned int    need_configure:1;
+        unsigned int    perp_mode:2;
+        unsigned int    has_fifo:1;
+        unsigned int    driver_version;
+        unsigned char   track[4];
+};
+
+struct compat_floppy_write_errors {
+        unsigned int    write_errors;
+        compat_ulong_t  first_error_sector;
+        compat_int_t    first_error_generation;
+        compat_ulong_t  last_error_sector;
+        compat_int_t    last_error_generation;
+        compat_uint_t   badness;
+};
+
+#define FDSETPRM32 _IOW(2, 0x42, struct compat_floppy_struct)
+#define FDDEFPRM32 _IOW(2, 0x43, struct compat_floppy_struct)
+#define FDGETPRM32 _IOR(2, 0x04, struct compat_floppy_struct)
+#define FDSETDRVPRM32 _IOW(2, 0x90, struct compat_floppy_drive_params)
+#define FDGETDRVPRM32 _IOR(2, 0x11, struct compat_floppy_drive_params)
+#define FDGETDRVSTAT32 _IOR(2, 0x12, struct compat_floppy_drive_struct)
+#define FDPOLLDRVSTAT32 _IOR(2, 0x13, struct compat_floppy_drive_struct)
+#define FDGETFDCSTAT32 _IOR(2, 0x15, struct compat_floppy_fdc_state)
+#define FDWERRORGET32  _IOR(2, 0x17, struct compat_floppy_write_errors)
+
+static struct {
+        unsigned int    cmd32;
+        unsigned int    cmd;
+} fd_ioctl_trans_table[] = {
+        { FDSETPRM32, FDSETPRM },
+        { FDDEFPRM32, FDDEFPRM },
+        { FDGETPRM32, FDGETPRM },
+        { FDSETDRVPRM32, FDSETDRVPRM },
+        { FDGETDRVPRM32, FDGETDRVPRM },
+        { FDGETDRVSTAT32, FDGETDRVSTAT },
+        { FDPOLLDRVSTAT32, FDPOLLDRVSTAT },
+        { FDGETFDCSTAT32, FDGETFDCSTAT },
+        { FDWERRORGET32, FDWERRORGET }
+};
+
+#define NR_FD_IOCTL_TRANS ARRAY_SIZE(fd_ioctl_trans_table)
+
+static int compat_fd_ioctl(struct inode *inode, struct file *file,
+                struct gendisk *disk, unsigned int cmd, unsigned long arg)
+{
+        mm_segment_t old_fs = get_fs();
+        void *karg = NULL;
+        unsigned int kcmd = 0;
+        int i, err;
+
+        for (i = 0; i < NR_FD_IOCTL_TRANS; i++)
+                if (cmd == fd_ioctl_trans_table[i].cmd32) {
+                        kcmd = fd_ioctl_trans_table[i].cmd;
+                        break;
+                }
+        if (!kcmd)
+                return -EINVAL;
+
+        switch (cmd) {
+        case FDSETPRM32:
+        case FDDEFPRM32:
+        case FDGETPRM32:
+        {
+                compat_uptr_t name;
+                struct compat_floppy_struct __user *uf;
+                struct floppy_struct *f;
+
+                uf = compat_ptr(arg);
+                f = karg = kmalloc(sizeof(struct floppy_struct), GFP_KERNEL);
+                if (!karg)
+                        return -ENOMEM;
+                if (cmd == FDGETPRM32)
+                        break;
+                err = __get_user(f->size, &uf->size);
+                err |= __get_user(f->sect, &uf->sect);
+                err |= __get_user(f->head, &uf->head);
+                err |= __get_user(f->track, &uf->track);
+                err |= __get_user(f->stretch, &uf->stretch);
+                err |= __get_user(f->gap, &uf->gap);
+                err |= __get_user(f->rate, &uf->rate);
+                err |= __get_user(f->spec1, &uf->spec1);
+                err |= __get_user(f->fmt_gap, &uf->fmt_gap);
+                err |= __get_user(name, &uf->name);
+                f->name = compat_ptr(name);
+                if (err) {
+                        err = -EFAULT;
+                        goto out;
+                }
+                break;
+        }
+        case FDSETDRVPRM32:
+        case FDGETDRVPRM32:
+        {
+                struct compat_floppy_drive_params __user *uf;
+                struct floppy_drive_params *f;
+
+                uf = compat_ptr(arg);
+                f = karg = kmalloc(sizeof(struct floppy_drive_params), GFP_KERNEL);
+                if (!karg)
+                        return -ENOMEM;
+                if (cmd == FDGETDRVPRM32)
+                        break;
+                err = __get_user(f->cmos, &uf->cmos);
+                err |= __get_user(f->max_dtr, &uf->max_dtr);
+                err |= __get_user(f->hlt, &uf->hlt);
+                err |= __get_user(f->hut, &uf->hut);
+                err |= __get_user(f->srt, &uf->srt);
+                err |= __get_user(f->spinup, &uf->spinup);
+                err |= __get_user(f->spindown, &uf->spindown);
+                err |= __get_user(f->spindown_offset, &uf->spindown_offset);
+                err |= __get_user(f->select_delay, &uf->select_delay);
+                err |= __get_user(f->rps, &uf->rps);
+                err |= __get_user(f->tracks, &uf->tracks);
+                err |= __get_user(f->timeout, &uf->timeout);
+                err |= __get_user(f->interleave_sect, &uf->interleave_sect);
+                err |= __copy_from_user(&f->max_errors, &uf->max_errors, sizeof(f->max_errors));
+                err |= __get_user(f->flags, &uf->flags);
+                err |= __get_user(f->read_track, &uf->read_track);
+                err |= __copy_from_user(f->autodetect, uf->autodetect, sizeof(f->autodetect));
+                err |= __get_user(f->checkfreq, &uf->checkfreq);
+                err |= __get_user(f->native_format, &uf->native_format);
+                if (err) {
+                        err = -EFAULT;
+                        goto out;
+                }
+                break;
+        }
+        case FDGETDRVSTAT32:
+        case FDPOLLDRVSTAT32:
+                karg = kmalloc(sizeof(struct floppy_drive_struct), GFP_KERNEL);
+                if (!karg)
+                        return -ENOMEM;
+                break;
+        case FDGETFDCSTAT32:
+                karg = kmalloc(sizeof(struct floppy_fdc_state), GFP_KERNEL);
+                if (!karg)
+                        return -ENOMEM;
+                break;
+        case FDWERRORGET32:
+                karg = kmalloc(sizeof(struct floppy_write_errors), GFP_KERNEL);
+                if (!karg)
+                        return -ENOMEM;
+                break;
+        default:
+                return -EINVAL;
+        }
+        set_fs(KERNEL_DS);
+        err = blkdev_driver_ioctl(inode, file, disk, kcmd, (unsigned long)karg);
+        set_fs(old_fs);
+        if (err)
+                goto out;
+        switch (cmd) {
+        case FDGETPRM32:
+        {
+                struct floppy_struct *f = karg;
+                struct compat_floppy_struct __user *uf = compat_ptr(arg);
+
+                err = __put_user(f->size, &uf->size);
+                err |= __put_user(f->sect, &uf->sect);
+                err |= __put_user(f->head, &uf->head);
+                err |= __put_user(f->track, &uf->track);
+                err |= __put_user(f->stretch, &uf->stretch);
+                err |= __put_user(f->gap, &uf->gap);
+                err |= __put_user(f->rate, &uf->rate);
+                err |= __put_user(f->spec1, &uf->spec1);
+                err |= __put_user(f->fmt_gap, &uf->fmt_gap);
+                err |= __put_user((u64)f->name, (compat_caddr_t __user *)&uf->name);
+                break;
+        }
+        case FDGETDRVPRM32:
+        {
+                struct compat_floppy_drive_params __user *uf;
+                struct floppy_drive_params *f = karg;
+
+                uf = compat_ptr(arg);
+                err = __put_user(f->cmos, &uf->cmos);
+                err |= __put_user(f->max_dtr, &uf->max_dtr);
+                err |= __put_user(f->hlt, &uf->hlt);
+                err |= __put_user(f->hut, &uf->hut);
+                err |= __put_user(f->srt, &uf->srt);
+                err |= __put_user(f->spinup, &uf->spinup);
+                err |= __put_user(f->spindown, &uf->spindown);
+                err |= __put_user(f->spindown_offset, &uf->spindown_offset);
+                err |= __put_user(f->select_delay, &uf->select_delay);
+                err |= __put_user(f->rps, &uf->rps);
+                err |= __put_user(f->tracks, &uf->tracks);
+                err |= __put_user(f->timeout, &uf->timeout);
+                err |= __put_user(f->interleave_sect, &uf->interleave_sect);
+                err |= __copy_to_user(&uf->max_errors, &f->max_errors, sizeof(f->max_errors));
+                err |= __put_user(f->flags, &uf->flags);
+                err |= __put_user(f->read_track, &uf->read_track);
+                err |= __copy_to_user(uf->autodetect, f->autodetect, sizeof(f->autodetect));
+                err |= __put_user(f->checkfreq, &uf->checkfreq);
+                err |= __put_user(f->native_format, &uf->native_format);
+                break;
+        }
+        case FDGETDRVSTAT32:
+        case FDPOLLDRVSTAT32:
+        {
+                struct compat_floppy_drive_struct __user *uf;
+                struct floppy_drive_struct *f = karg;
+
+                uf = compat_ptr(arg);
+                err = __put_user(f->flags, &uf->flags);
+                err |= __put_user(f->spinup_date, &uf->spinup_date);
+                err |= __put_user(f->select_date, &uf->select_date);
+                err |= __put_user(f->first_read_date, &uf->first_read_date);
+                err |= __put_user(f->probed_format, &uf->probed_format);
+                err |= __put_user(f->track, &uf->track);
+                err |= __put_user(f->maxblock, &uf->maxblock);
+                err |= __put_user(f->maxtrack, &uf->maxtrack);
+                err |= __put_user(f->generation, &uf->generation);
+                err |= __put_user(f->keep_data, &uf->keep_data);
+                err |= __put_user(f->fd_ref, &uf->fd_ref);
+                err |= __put_user(f->fd_device, &uf->fd_device);
+                err |= __put_user(f->last_checked, &uf->last_checked);
+                err |= __put_user((u64)f->dmabuf, &uf->dmabuf);
+                err |= __put_user((u64)f->bufblocks, &uf->bufblocks);
+                break;
+        }
+        case FDGETFDCSTAT32:
+        {
+                struct compat_floppy_fdc_state __user *uf;
+                struct floppy_fdc_state *f = karg;
+
+                uf = compat_ptr(arg);
+                err = __put_user(f->spec1, &uf->spec1);
+                err |= __put_user(f->spec2, &uf->spec2);
+                err |= __put_user(f->dtr, &uf->dtr);
+                err |= __put_user(f->version, &uf->version);
+                err |= __put_user(f->dor, &uf->dor);
+                err |= __put_user(f->address, &uf->address);
+                err |= __copy_to_user((char __user *)&uf->address + sizeof(uf->address),
+                                   (char *)&f->address + sizeof(f->address), sizeof(int));
+                err |= __put_user(f->driver_version, &uf->driver_version);
+                err |= __copy_to_user(uf->track, f->track, sizeof(f->track));
+                break;
+        }
+        case FDWERRORGET32:
+        {
+                struct compat_floppy_write_errors __user *uf;
+                struct floppy_write_errors *f = karg;
+
+                uf = compat_ptr(arg);
+                err = __put_user(f->write_errors, &uf->write_errors);
+                err |= __put_user(f->first_error_sector, &uf->first_error_sector);
+                err |= __put_user(f->first_error_generation, &uf->first_error_generation);
+                err |= __put_user(f->last_error_sector, &uf->last_error_sector);
+                err |= __put_user(f->last_error_generation, &uf->last_error_generation);
+                err |= __put_user(f->badness, &uf->badness);
+                break;
+        }
+        default:
+                break;
+        }
+        if (err)
+                err = -EFAULT;
+
+out:
+        kfree(karg);
+        return err;
+}
+
+struct compat_blk_user_trace_setup {
+        char name[32];
+        u16 act_mask;
+        u32 buf_size;
+        u32 buf_nr;
+        compat_u64 start_lba;
+        compat_u64 end_lba;
+        u32 pid;
+};
+#define BLKTRACESETUP32 _IOWR(0x12, 115, struct compat_blk_user_trace_setup)
+
+static int compat_blk_trace_setup(struct block_device *bdev, char __user *arg)
+{
+        struct blk_user_trace_setup buts;
+        struct compat_blk_user_trace_setup cbuts;
+        struct request_queue *q;
+        int ret;
+
+        q = bdev_get_queue(bdev);
+        if (!q)
+                return -ENXIO;
+
+        if (copy_from_user(&cbuts, arg, sizeof(cbuts)))
+                return -EFAULT;
+
+        buts = (struct blk_user_trace_setup) {
+                .act_mask = cbuts.act_mask,
+                .buf_size = cbuts.buf_size,
+                .buf_nr = cbuts.buf_nr,
+                .start_lba = cbuts.start_lba,
+                .end_lba = cbuts.end_lba,
+                .pid = cbuts.pid,
+        };
+        memcpy(&buts.name, &cbuts.name, 32);
+
+        mutex_lock(&bdev->bd_mutex);
+        ret = do_blk_trace_setup(q, bdev, &buts);
+        mutex_unlock(&bdev->bd_mutex);
+        if (ret)
+                return ret;
+
+        if (copy_to_user(arg, &buts.name, 32))
+                return -EFAULT;
+
+        return 0;
+}
+
+static int compat_blkdev_driver_ioctl(struct inode *inode, struct file *file,
+                        struct gendisk *disk, unsigned cmd, unsigned long arg)
+{
+        int ret;
+
+        switch (arg) {
+        case HDIO_GET_UNMASKINTR:
+        case HDIO_GET_MULTCOUNT:
+        case HDIO_GET_KEEPSETTINGS:
+        case HDIO_GET_32BIT:
+        case HDIO_GET_NOWERR:
+        case HDIO_GET_DMA:
+        case HDIO_GET_NICE:
+        case HDIO_GET_WCACHE:
+        case HDIO_GET_ACOUSTIC:
+        case HDIO_GET_ADDRESS:
+        case HDIO_GET_BUSSTATE:
+                return compat_hdio_ioctl(inode, file, disk, cmd, arg);
+        case FDSETPRM32:
+        case FDDEFPRM32:
+        case FDGETPRM32:
+        case FDSETDRVPRM32:
+        case FDGETDRVPRM32:
+        case FDGETDRVSTAT32:
+        case FDPOLLDRVSTAT32:
+        case FDGETFDCSTAT32:
+        case FDWERRORGET32:
+                return compat_fd_ioctl(inode, file, disk, cmd, arg);
+        case CDROMREADAUDIO:
+                return compat_cdrom_read_audio(inode, file, disk, cmd, arg);
+        case CDROM_SEND_PACKET:
+                return compat_cdrom_generic_command(inode, file, disk, cmd, arg);
+
+        /*
+         * No handler required for the ones below, we just need to
+         * convert arg to a 64 bit pointer.
+         */
+        case BLKSECTSET:
+        /*
+         * 0x03 -- HD/IDE ioctl's used by hdparm and friends.
+         *         Some need translations, these do not.
+         */
+        case HDIO_GET_IDENTITY:
+        case HDIO_DRIVE_TASK:
+        case HDIO_DRIVE_CMD:
+        case HDIO_SCAN_HWIF:
+        /* 0x330 is reserved -- it used to be HDIO_GETGEO_BIG */
+        case 0x330:
+        /* 0x02 -- Floppy ioctls */
+        case FDMSGON:
+        case FDMSGOFF:
+        case FDSETEMSGTRESH:
+        case FDFLUSH:
+        case FDWERRORCLR:
+        case FDSETMAXERRS:
+        case FDGETMAXERRS:
+        case FDGETDRVTYP:
+        case FDEJECT:
+        case FDCLRPRM:
+        case FDFMTBEG:
+        case FDFMTEND:
+        case FDRESET:
+        case FDTWADDLE:
+        case FDFMTTRK:
+        case FDRAWCMD:
+        /* CDROM stuff */
+        case CDROMPAUSE:
+        case CDROMRESUME:
+        case CDROMPLAYMSF:
+        case CDROMPLAYTRKIND:
+        case CDROMREADTOCHDR:
+        case CDROMREADTOCENTRY:
+        case CDROMSTOP:
+        case CDROMSTART:
+        case CDROMEJECT:
+        case CDROMVOLCTRL:
+        case CDROMSUBCHNL:
+        case CDROMMULTISESSION:
+        case CDROM_GET_MCN:
+        case CDROMRESET:
+        case CDROMVOLREAD:
+        case CDROMSEEK:
+        case CDROMPLAYBLK:
+        case CDROMCLOSETRAY:
+        case CDROM_DISC_STATUS:
+        case CDROM_CHANGER_NSLOTS:
+        case CDROM_GET_CAPABILITY:
+        /* Ignore cdrom.h about these next 5 ioctls, they absolutely do
+         * not take a struct cdrom_read, instead they take a struct cdrom_msf
+         * which is compatible.
+         */
+        case CDROMREADMODE2:
+        case CDROMREADMODE1:
+        case CDROMREADRAW:
+        case CDROMREADCOOKED:
+        case CDROMREADALL:
+        /* DVD ioctls */
+        case DVD_READ_STRUCT:
+        case DVD_WRITE_STRUCT:
+        case DVD_AUTH:
+                arg = (unsigned long)compat_ptr(arg);
+        /* These intepret arg as an unsigned long, not as a pointer,
+         * so we must not do compat_ptr() conversion. */
+        case HDIO_SET_MULTCOUNT:
+        case HDIO_SET_UNMASKINTR:
+        case HDIO_SET_KEEPSETTINGS:
+        case HDIO_SET_32BIT:
+        case HDIO_SET_NOWERR:
+        case HDIO_SET_DMA:
+        case HDIO_SET_PIO_MODE:
+        case HDIO_SET_NICE:
+        case HDIO_SET_WCACHE:
+        case HDIO_SET_ACOUSTIC:
+        case HDIO_SET_BUSSTATE:
+        case HDIO_SET_ADDRESS:
+        case CDROMEJECT_SW:
+        case CDROM_SET_OPTIONS:
+        case CDROM_CLEAR_OPTIONS:
+        case CDROM_SELECT_SPEED:
+        case CDROM_SELECT_DISC:
+        case CDROM_MEDIA_CHANGED:
+        case CDROM_DRIVE_STATUS:
+        case CDROM_LOCKDOOR:
+        case CDROM_DEBUG:
+                break;
+        default:
+                /* unknown ioctl number */
+                return -ENOIOCTLCMD;
+        }
+
+        if (disk->fops->unlocked_ioctl)
+                return disk->fops->unlocked_ioctl(file, cmd, arg);
+
+        if (disk->fops->ioctl) {
+                lock_kernel();
+                ret = disk->fops->ioctl(inode, file, cmd, arg);
+                unlock_kernel();
+                return ret;
+        }
+
+        return -ENOTTY;
+}
+
+static int compat_blkdev_locked_ioctl(struct inode *inode, struct file *file,
+                                struct block_device *bdev,
+                                unsigned cmd, unsigned long arg)
+{
+        struct backing_dev_info *bdi;
+
+        switch (cmd) {
+        case BLKRAGET:
+        case BLKFRAGET:
+                if (!arg)
+                        return -EINVAL;
+                bdi = blk_get_backing_dev_info(bdev);
+                if (bdi == NULL)
+                        return -ENOTTY;
+                return compat_put_long(arg,
+                                       (bdi->ra_pages * PAGE_CACHE_SIZE) / 512);
+        case BLKROGET: /* compatible */
+                return compat_put_int(arg, bdev_read_only(bdev) != 0);
+        case BLKBSZGET_32: /* get the logical block size (cf. BLKSSZGET) */
+                return compat_put_int(arg, block_size(bdev));
+        case BLKSSZGET: /* get block device hardware sector size */
+                return compat_put_int(arg, bdev_hardsect_size(bdev));
+        case BLKSECTGET:
+                return compat_put_ushort(arg,
+                                         bdev_get_queue(bdev)->max_sectors);
+        case BLKRASET: /* compatible, but no compat_ptr (!) */
+        case BLKFRASET:
+                if (!capable(CAP_SYS_ADMIN))
+                        return -EACCES;
+                bdi = blk_get_backing_dev_info(bdev);
+                if (bdi == NULL)
+                        return -ENOTTY;
+                bdi->ra_pages = (arg * 512) / PAGE_CACHE_SIZE;
+                return 0;
+        case BLKGETSIZE:
+                if ((bdev->bd_inode->i_size >> 9) > ~0UL)
+                        return -EFBIG;
+                return compat_put_ulong(arg, bdev->bd_inode->i_size >> 9);
+
+        case BLKGETSIZE64_32:
+                return compat_put_u64(arg, bdev->bd_inode->i_size);
+
+        case BLKTRACESETUP32:
+                return compat_blk_trace_setup(bdev, compat_ptr(arg));
+        case BLKTRACESTART: /* compatible */
+        case BLKTRACESTOP:  /* compatible */
+        case BLKTRACETEARDOWN: /* compatible */
+                return blk_trace_ioctl(bdev, cmd, compat_ptr(arg));
+        }
+        return -ENOIOCTLCMD;
+}
+
+/* Most of the generic ioctls are handled in the normal fallback path.
+   This assumes the blkdev's low level compat_ioctl always returns
+   ENOIOCTLCMD for unknown ioctls. */
+long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
+{
+        int ret = -ENOIOCTLCMD;
+        struct inode *inode = file->f_mapping->host;
+        struct block_device *bdev = inode->i_bdev;
+        struct gendisk *disk = bdev->bd_disk;
+
+        switch (cmd) {
+        case HDIO_GETGEO:
+                return compat_hdio_getgeo(disk, bdev, compat_ptr(arg));
+        case BLKFLSBUF:
+        case BLKROSET:
+        /*
+         * the ones below are implemented in blkdev_locked_ioctl,
+         * but we call blkdev_ioctl, which gets the lock for us
+         */
+        case BLKRRPART:
+                return blkdev_ioctl(inode, file, cmd,
+                                (unsigned long)compat_ptr(arg));
+        case BLKBSZSET_32:
+                return blkdev_ioctl(inode, file, BLKBSZSET,
+                                (unsigned long)compat_ptr(arg));
+        case BLKPG:
+                return compat_blkpg_ioctl(inode, file, cmd, compat_ptr(arg));
+        }
+
+        lock_kernel();
+        ret = compat_blkdev_locked_ioctl(inode, file, bdev, cmd, arg);
+        /* FIXME: why do we assume -> compat_ioctl needs the BKL? */
+        if (ret == -ENOIOCTLCMD && disk->fops->compat_ioctl)
+                ret = disk->fops->compat_ioctl(file, cmd, arg);
+        unlock_kernel();
+
+        if (ret != -ENOIOCTLCMD)
+                return ret;
+
+        return compat_blkdev_driver_ioctl(inode, file, disk, cmd, arg);
+}
diff --git a/block/elevator.c b/block/elevator.c
index c6d153de9fd6..b9c518afe1f8 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -186,7 +186,7 @@ static elevator_t *elevator_alloc(struct request_queue *q,
         eq->ops = &e->ops;
         eq->elevator_type = e;
         kobject_init(&eq->kobj);
-        snprintf(eq->kobj.name, KOBJ_NAME_LEN, "%s", "iosched");
+        kobject_set_name(&eq->kobj, "%s", "iosched");
         eq->kobj.ktype = &elv_ktype;
         mutex_init(&eq->sysfs_lock);
 
diff --git a/block/genhd.c b/block/genhd.c
index 3af1e7a378d4..e609996f2e76 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -540,61 +540,42 @@ static int block_uevent_filter(struct kset *kset, struct kobject *kobj)
         return ((ktype == &ktype_block) || (ktype == &ktype_part));
 }
 
-static int block_uevent(struct kset *kset, struct kobject *kobj, char **envp,
-                         int num_envp, char *buffer, int buffer_size)
+static int block_uevent(struct kset *kset, struct kobject *kobj,
+                        struct kobj_uevent_env *env)
 {
         struct kobj_type *ktype = get_ktype(kobj);
         struct device *physdev;
         struct gendisk *disk;
         struct hd_struct *part;
-        int length = 0;
-        int i = 0;
 
         if (ktype == &ktype_block) {
                 disk = container_of(kobj, struct gendisk, kobj);
-                add_uevent_var(envp, num_envp, &i, buffer, buffer_size,
-                               &length, "MINOR=%u", disk->first_minor);
+                add_uevent_var(env, "MINOR=%u", disk->first_minor);
         } else if (ktype == &ktype_part) {
                 disk = container_of(kobj->parent, struct gendisk, kobj);
                 part = container_of(kobj, struct hd_struct, kobj);
-                add_uevent_var(envp, num_envp, &i, buffer, buffer_size,
-                               &length, "MINOR=%u",
+                add_uevent_var(env, "MINOR=%u",
                                disk->first_minor + part->partno);
         } else
                 return 0;
 
-        add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
-                       "MAJOR=%u", disk->major);
+        add_uevent_var(env, "MAJOR=%u", disk->major);
 
         /* add physical device, backing this device  */
         physdev = disk->driverfs_dev;
         if (physdev) {
                 char *path = kobject_get_path(&physdev->kobj, GFP_KERNEL);
 
-                add_uevent_var(envp, num_envp, &i, buffer, buffer_size,
-                               &length, "PHYSDEVPATH=%s", path);
+                add_uevent_var(env, "PHYSDEVPATH=%s", path);
                 kfree(path);
 
                 if (physdev->bus)
-                        add_uevent_var(envp, num_envp, &i,
-                                       buffer, buffer_size, &length,
-                                       "PHYSDEVBUS=%s",
-                                       physdev->bus->name);
+                        add_uevent_var(env, "PHYSDEVBUS=%s", physdev->bus->name);
 
                 if (physdev->driver)
-                        add_uevent_var(envp, num_envp, &i,
-                                       buffer, buffer_size, &length,
-                                       "PHYSDEVDRIVER=%s",
-                                       physdev->driver->name);
+                        add_uevent_var(env, physdev->driver->name);
         }
 
-        /* terminate, set to next free slot, shrink available space */
-        envp[i] = NULL;
-        envp = &envp[i];
-        num_envp -= i;
-        buffer = &buffer[length];
-        buffer_size -= length;
-
         return 0;
 }
 
diff --git a/block/ioctl.c b/block/ioctl.c
index f7e3e8abf887..52d6385216ad 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -217,6 +217,10 @@ int blkdev_driver_ioctl(struct inode *inode, struct file *file,
 }
 EXPORT_SYMBOL_GPL(blkdev_driver_ioctl);
 
+/*
+ * always keep this in sync with compat_blkdev_ioctl() and
+ * compat_blkdev_locked_ioctl()
+ */
 int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,
                         unsigned long arg)
 {
@@ -284,21 +288,4 @@ int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,
 
         return blkdev_driver_ioctl(inode, file, disk, cmd, arg);
 }
-
-/* Most of the generic ioctls are handled in the normal fallback path.
-   This assumes the blkdev's low level compat_ioctl always returns
-   ENOIOCTLCMD for unknown ioctls. */
-long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
-{
-        struct block_device *bdev = file->f_path.dentry->d_inode->i_bdev;
-        struct gendisk *disk = bdev->bd_disk;
-        int ret = -ENOIOCTLCMD;
-        if (disk->fops->compat_ioctl) {
-                lock_kernel();
-                ret = disk->fops->compat_ioctl(file, cmd, arg);
-                unlock_kernel();
-        }
-        return ret;
-}
-
 EXPORT_SYMBOL_GPL(blkdev_ioctl);
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index ed39313c4085..d875673e76cd 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -42,6 +42,9 @@ static void drive_stat_acct(struct request *rq, int nr_sectors, int new_io);
 static void init_request_from_bio(struct request *req, struct bio *bio);
 static int __make_request(struct request_queue *q, struct bio *bio);
 static struct io_context *current_io_context(gfp_t gfp_flags, int node);
+static void blk_recalc_rq_segments(struct request *rq);
+static void blk_rq_bio_prep(struct request_queue *q, struct request *rq,
+                            struct bio *bio);
 
 /*
  * For the allocated request tables
@@ -428,7 +431,6 @@ static void queue_flush(struct request_queue *q, unsigned which)
 static inline struct request *start_ordered(struct request_queue *q,
                                             struct request *rq)
 {
-        q->bi_size = 0;
         q->orderr = 0;
         q->ordered = q->next_ordered;
         q->ordseq |= QUEUE_ORDSEQ_STARTED;
@@ -525,56 +527,36 @@ int blk_do_ordered(struct request_queue *q, struct request **rqp)
         return 1;
 }
 
-static int flush_dry_bio_endio(struct bio *bio, unsigned int bytes, int error)
-{
-        struct request_queue *q = bio->bi_private;
-
-        /*
-         * This is dry run, restore bio_sector and size.  We'll finish
-         * this request again with the original bi_end_io after an
-         * error occurs or post flush is complete.
-         */
-        q->bi_size += bytes;
-
-        if (bio->bi_size)
-                return 1;
-
-        /* Reset bio */
-        set_bit(BIO_UPTODATE, &bio->bi_flags);
-        bio->bi_size = q->bi_size;
-        bio->bi_sector -= (q->bi_size >> 9);
-        q->bi_size = 0;
-
-        return 0;
-}
-
-static int ordered_bio_endio(struct request *rq, struct bio *bio,
-                             unsigned int nbytes, int error)
+static void req_bio_endio(struct request *rq, struct bio *bio,
+                          unsigned int nbytes, int error)
 {
         struct request_queue *q = rq->q;
-        bio_end_io_t *endio;
-        void *private;
 
-        if (&q->bar_rq != rq)
-                return 0;
-
-        /*
-         * Okay, this is the barrier request in progress, dry finish it.
-         */
-        if (error && !q->orderr)
-                q->orderr = error;
+        if (&q->bar_rq != rq) {
+                if (error)
+                        clear_bit(BIO_UPTODATE, &bio->bi_flags);
+                else if (!test_bit(BIO_UPTODATE, &bio->bi_flags))
+                        error = -EIO;
 
-        endio = bio->bi_end_io;
-        private = bio->bi_private;
-        bio->bi_end_io = flush_dry_bio_endio;
-        bio->bi_private = q;
-
-        bio_endio(bio, nbytes, error);
+                if (unlikely(nbytes > bio->bi_size)) {
+                        printk("%s: want %u bytes done, only %u left\n",
+                               __FUNCTION__, nbytes, bio->bi_size);
+                        nbytes = bio->bi_size;
+                }
 
-        bio->bi_end_io = endio;
-        bio->bi_private = private;
+                bio->bi_size -= nbytes;
+                bio->bi_sector += (nbytes >> 9);
+                if (bio->bi_size == 0)
+                        bio_endio(bio, error);
+        } else {
 
-        return 1;
+                /*
+                 * Okay, this is the barrier request in progress, just
+                 * record the error;
+                 */
+                if (error && !q->orderr)
+                        q->orderr = error;
+        }
 }
 
 /**
@@ -1220,16 +1202,40 @@ EXPORT_SYMBOL(blk_dump_rq_flags);
 
 void blk_recount_segments(struct request_queue *q, struct bio *bio)
 {
+        struct request rq;
+        struct bio *nxt = bio->bi_next;
+        rq.q = q;
+        rq.bio = rq.biotail = bio;
+        bio->bi_next = NULL;
+        blk_recalc_rq_segments(&rq);
+        bio->bi_next = nxt;
+        bio->bi_phys_segments = rq.nr_phys_segments;
+        bio->bi_hw_segments = rq.nr_hw_segments;
+        bio->bi_flags |= (1 << BIO_SEG_VALID);
+}
+EXPORT_SYMBOL(blk_recount_segments);
+
+static void blk_recalc_rq_segments(struct request *rq)
+{
+        int nr_phys_segs;
+        int nr_hw_segs;
+        unsigned int phys_size;
+        unsigned int hw_size;
         struct bio_vec *bv, *bvprv = NULL;
-        int i, nr_phys_segs, nr_hw_segs, seg_size, hw_seg_size, cluster;
+        int seg_size;
+        int hw_seg_size;
+        int cluster;
+        struct req_iterator iter;
         int high, highprv = 1;
+        struct request_queue *q = rq->q;
 
-        if (unlikely(!bio->bi_io_vec))
+        if (!rq->bio)
                 return;
 
         cluster = q->queue_flags & (1 << QUEUE_FLAG_CLUSTER);
-        hw_seg_size = seg_size = nr_phys_segs = nr_hw_segs = 0;
-        bio_for_each_segment(bv, bio, i) {
+        hw_seg_size = seg_size = 0;
+        phys_size = hw_size = nr_phys_segs = nr_hw_segs = 0;
+        rq_for_each_segment(bv, rq, iter) {
                 /*
                  * the trick here is making sure that a high page is never
                  * considered part of another segment, since that might
@@ -1255,12 +1261,13 @@ void blk_recount_segments(struct request_queue *q, struct bio *bio)
                 }
 new_segment:
                 if (BIOVEC_VIRT_MERGEABLE(bvprv, bv) &&
-                    !BIOVEC_VIRT_OVERSIZE(hw_seg_size + bv->bv_len)) {
+                    !BIOVEC_VIRT_OVERSIZE(hw_seg_size + bv->bv_len))
                         hw_seg_size += bv->bv_len;
-                } else {
+                else {
 new_hw_segment:
-                        if (hw_seg_size > bio->bi_hw_front_size)
-                                bio->bi_hw_front_size = hw_seg_size;
+                        if (nr_hw_segs == 1 &&
+                            hw_seg_size > rq->bio->bi_hw_front_size)
+                                rq->bio->bi_hw_front_size = hw_seg_size;
                         hw_seg_size = BIOVEC_VIRT_START_SIZE(bv) + bv->bv_len;
                         nr_hw_segs++;
                 }
@@ -1270,15 +1277,15 @@ new_hw_segment:
                 seg_size = bv->bv_len;
                 highprv = high;
         }
-        if (hw_seg_size > bio->bi_hw_back_size)
-                bio->bi_hw_back_size = hw_seg_size;
-        if (nr_hw_segs == 1 && hw_seg_size > bio->bi_hw_front_size)
-                bio->bi_hw_front_size = hw_seg_size;
-        bio->bi_phys_segments = nr_phys_segs;
-        bio->bi_hw_segments = nr_hw_segs;
-        bio->bi_flags |= (1 << BIO_SEG_VALID);
+
+        if (nr_hw_segs == 1 &&
+            hw_seg_size > rq->bio->bi_hw_front_size)
+                rq->bio->bi_hw_front_size = hw_seg_size;
+        if (hw_seg_size > rq->biotail->bi_hw_back_size)
+                rq->biotail->bi_hw_back_size = hw_seg_size;
+        rq->nr_phys_segments = nr_phys_segs;
+        rq->nr_hw_segments = nr_hw_segs;
 }
-EXPORT_SYMBOL(blk_recount_segments);
 
 static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio,
                                    struct bio *nxt)
@@ -1325,8 +1332,8 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
                   struct scatterlist *sg)
 {
         struct bio_vec *bvec, *bvprv;
-        struct bio *bio;
-        int nsegs, i, cluster;
+        struct req_iterator iter;
+        int nsegs, cluster;
 
         nsegs = 0;
         cluster = q->queue_flags & (1 << QUEUE_FLAG_CLUSTER);
@@ -1335,35 +1342,30 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
          * for each bio in rq
          */
         bvprv = NULL;
-        rq_for_each_bio(bio, rq) {
-                /*
-                 * for each segment in bio
-                 */
-                bio_for_each_segment(bvec, bio, i) {
-                        int nbytes = bvec->bv_len;
+        rq_for_each_segment(bvec, rq, iter) {
+                int nbytes = bvec->bv_len;
 
-                        if (bvprv && cluster) {
-                                if (sg[nsegs - 1].length + nbytes > q->max_segment_size)
-                                        goto new_segment;
+                if (bvprv && cluster) {
+                        if (sg[nsegs - 1].length + nbytes > q->max_segment_size)
+                                goto new_segment;
 
-                                if (!BIOVEC_PHYS_MERGEABLE(bvprv, bvec))
-                                        goto new_segment;
-                                if (!BIOVEC_SEG_BOUNDARY(q, bvprv, bvec))
-                                        goto new_segment;
+                        if (!BIOVEC_PHYS_MERGEABLE(bvprv, bvec))
+                                goto new_segment;
+                        if (!BIOVEC_SEG_BOUNDARY(q, bvprv, bvec))
+                                goto new_segment;
 
-                                sg[nsegs - 1].length += nbytes;
-                        } else {
+                        sg[nsegs - 1].length += nbytes;
+                } else {
 new_segment:
-                                memset(&sg[nsegs],0,sizeof(struct scatterlist));
-                                sg[nsegs].page = bvec->bv_page;
-                                sg[nsegs].length = nbytes;
-                                sg[nsegs].offset = bvec->bv_offset;
+                        memset(&sg[nsegs],0,sizeof(struct scatterlist));
+                        sg[nsegs].page = bvec->bv_page;
+                        sg[nsegs].length = nbytes;
+                        sg[nsegs].offset = bvec->bv_offset;
 
-                                nsegs++;
-                        }
-                        bvprv = bvec;
-                } /* segments in bio */
-        } /* bios in rq */
+                        nsegs++;
+                }
+                bvprv = bvec;
+        } /* segments in rq */
 
         return nsegs;
 }
@@ -1420,7 +1422,8 @@ static inline int ll_new_hw_segment(struct request_queue *q,
         return 1;
 }
 
-int ll_back_merge_fn(struct request_queue *q, struct request *req, struct bio *bio)
+static int ll_back_merge_fn(struct request_queue *q, struct request *req,
+                            struct bio *bio)
 {
         unsigned short max_sectors;
         int len;
@@ -1456,7 +1459,6 @@ int ll_back_merge_fn(struct request_queue *q, struct request *req, struct bio *b
 
         return ll_new_hw_segment(q, req, bio);
 }
-EXPORT_SYMBOL(ll_back_merge_fn);
 
 static int ll_front_merge_fn(struct request_queue *q, struct request *req, 
                              struct bio *bio)
@@ -1852,7 +1854,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
 
         init_timer(&q->unplug_timer);
 
-        snprintf(q->kobj.name, KOBJ_NAME_LEN, "%s", "queue");
+        kobject_set_name(&q->kobj, "%s", "queue");
         q->kobj.ktype = &queue_ktype;
         kobject_init(&q->kobj);
 
@@ -2346,6 +2348,23 @@ static int __blk_rq_unmap_user(struct bio *bio)
         return ret;
 }
 
+int blk_rq_append_bio(struct request_queue *q, struct request *rq,
+                      struct bio *bio)
+{
+        if (!rq->bio)
+                blk_rq_bio_prep(q, rq, bio);
+        else if (!ll_back_merge_fn(q, rq, bio))
+                return -EINVAL;
+        else {
+                rq->biotail->bi_next = bio;
+                rq->biotail = bio;
+
+                rq->data_len += bio->bi_size;
+        }
+        return 0;
+}
+EXPORT_SYMBOL(blk_rq_append_bio);
+
 static int __blk_rq_map_user(struct request_queue *q, struct request *rq,
                              void __user *ubuf, unsigned int len)
 {
@@ -2377,23 +2396,12 @@ static int __blk_rq_map_user(struct request_queue *q, struct request *rq,
          */
         bio_get(bio);
 
-        if (!rq->bio)
-                blk_rq_bio_prep(q, rq, bio);
-        else if (!ll_back_merge_fn(q, rq, bio)) {
-                ret = -EINVAL;
-                goto unmap_bio;
-        } else {
-                rq->biotail->bi_next = bio;
-                rq->biotail = bio;
-
-                rq->data_len += bio->bi_size;
-        }
-
-        return bio->bi_size;
+        ret = blk_rq_append_bio(q, rq, bio);
+        if (!ret)
+                return bio->bi_size;
 
-unmap_bio:
         /* if it was boucned we must call the end io function */
-        bio_endio(bio, bio->bi_size, 0);
+        bio_endio(bio, 0);
         __blk_rq_unmap_user(orig_bio);
         bio_put(bio);
         return ret;
@@ -2502,7 +2510,7 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
                 return PTR_ERR(bio);
 
         if (bio->bi_size != len) {
-                bio_endio(bio, bio->bi_size, 0);
+                bio_endio(bio, 0);
                 bio_unmap_user(bio);
                 return -EINVAL;
         }
@@ -2912,15 +2920,9 @@ static void init_request_from_bio(struct request *req, struct bio *bio)
 
         req->errors = 0;
         req->hard_sector = req->sector = bio->bi_sector;
-        req->hard_nr_sectors = req->nr_sectors = bio_sectors(bio);
-        req->current_nr_sectors = req->hard_cur_sectors = bio_cur_sectors(bio);
-        req->nr_phys_segments = bio_phys_segments(req->q, bio);
-        req->nr_hw_segments = bio_hw_segments(req->q, bio);
-        req->buffer = bio_data(bio);    /* see ->buffer comment above */
-        req->bio = req->biotail = bio;
         req->ioprio = bio_prio(bio);
-        req->rq_disk = bio->bi_bdev->bd_disk;
         req->start_time = jiffies;
+        blk_rq_bio_prep(req->q, req, bio);
 }
 
 static int __make_request(struct request_queue *q, struct bio *bio)
@@ -3038,7 +3040,7 @@ out:
         return 0;
 
 end_io:
-        bio_endio(bio, nr_sectors << 9, err);
+        bio_endio(bio, err);
         return 0;
 }
 
@@ -3185,7 +3187,7 @@ static inline void __generic_make_request(struct bio *bio)
                                 bdevname(bio->bi_bdev, b),
                                 (long long) bio->bi_sector);
 end_io:
-                        bio_endio(bio, bio->bi_size, -EIO);
+                        bio_endio(bio, -EIO);
                         break;
                 }
 
@@ -3329,48 +3331,6 @@ void submit_bio(int rw, struct bio *bio)
 
 EXPORT_SYMBOL(submit_bio);
 
-static void blk_recalc_rq_segments(struct request *rq)
-{
-        struct bio *bio, *prevbio = NULL;
-        int nr_phys_segs, nr_hw_segs;
-        unsigned int phys_size, hw_size;
-        struct request_queue *q = rq->q;
-
-        if (!rq->bio)
-                return;
-
-        phys_size = hw_size = nr_phys_segs = nr_hw_segs = 0;
-        rq_for_each_bio(bio, rq) {
-                /* Force bio hw/phys segs to be recalculated. */
-                bio->bi_flags &= ~(1 << BIO_SEG_VALID);
-
-                nr_phys_segs += bio_phys_segments(q, bio);
-                nr_hw_segs += bio_hw_segments(q, bio);
-                if (prevbio) {
-                        int pseg = phys_size + prevbio->bi_size + bio->bi_size;
-                        int hseg = hw_size + prevbio->bi_size + bio->bi_size;
-
-                        if (blk_phys_contig_segment(q, prevbio, bio) &&
-                            pseg <= q->max_segment_size) {
-                                nr_phys_segs--;
-                                phys_size += prevbio->bi_size + bio->bi_size;
-                        } else
-                                phys_size = 0;
-
-                        if (blk_hw_contig_segment(q, prevbio, bio) &&
-                            hseg <= q->max_segment_size) {
-                                nr_hw_segs--;
-                                hw_size += prevbio->bi_size + bio->bi_size;
-                        } else
-                                hw_size = 0;
-                }
-                prevbio = bio;
-        }
-
-        rq->nr_phys_segments = nr_phys_segs;
-        rq->nr_hw_segments = nr_hw_segs;
-}
-
 static void blk_recalc_rq_sectors(struct request *rq, int nsect)
 {
         if (blk_fs_request(rq)) {
@@ -3442,8 +3402,7 @@ static int __end_that_request_first(struct request *req, int uptodate,
                 if (nr_bytes >= bio->bi_size) {
                         req->bio = bio->bi_next;
                         nbytes = bio->bi_size;
-                        if (!ordered_bio_endio(req, bio, nbytes, error))
-                                bio_endio(bio, nbytes, error);
+                        req_bio_endio(req, bio, nbytes, error);
                         next_idx = 0;
                         bio_nbytes = 0;
                 } else {
@@ -3498,8 +3457,7 @@ static int __end_that_request_first(struct request *req, int uptodate,
          * if the request wasn't completed, update state
          */
         if (bio_nbytes) {
-                if (!ordered_bio_endio(req, bio, bio_nbytes, error))
-                        bio_endio(bio, bio_nbytes, error);
+                req_bio_endio(req, bio, bio_nbytes, error);
                 bio->bi_idx += next_idx;
                 bio_iovec(bio)->bv_offset += nr_bytes;
                 bio_iovec(bio)->bv_len -= nr_bytes;
@@ -3574,7 +3532,7 @@ static void blk_done_softirq(struct softirq_action *h)
         }
 }
 
-static int blk_cpu_notify(struct notifier_block *self, unsigned long action,
+static int __cpuinit blk_cpu_notify(struct notifier_block *self, unsigned long action,
                           void *hcpu)
 {
         /*
@@ -3595,7 +3553,7 @@ static int blk_cpu_notify(struct notifier_block *self, unsigned long action,
 }
 
 
-static struct notifier_block __devinitdata blk_cpu_notifier = {
+static struct notifier_block blk_cpu_notifier __cpuinitdata = {
         .notifier_call  = blk_cpu_notify,
 };
 
@@ -3680,8 +3638,8 @@ void end_request(struct request *req, int uptodate)
 
 EXPORT_SYMBOL(end_request);
 
-void blk_rq_bio_prep(struct request_queue *q, struct request *rq,
-                     struct bio *bio)
+static void blk_rq_bio_prep(struct request_queue *q, struct request *rq,
+                            struct bio *bio)
 {
         /* first two bits are identical in rq->cmd_flags and bio->bi_rw */
         rq->cmd_flags |= (bio->bi_rw & 3);
@@ -3695,9 +3653,10 @@ void blk_rq_bio_prep(struct request_queue *q, struct request *rq,
         rq->data_len = bio->bi_size;
 
         rq->bio = rq->biotail = bio;
-}
 
-EXPORT_SYMBOL(blk_rq_bio_prep);
+        if (bio->bi_bdev)
+                rq->rq_disk = bio->bi_bdev->bd_disk;
+}
 
 int kblockd_schedule_work(struct work_struct *work)
 {