[GIT PULL] block bits for 2.6.32-rc1

[GIT PULL] block bits for 2.6.32-rc1

[Jens Axboe]

Hi Linus,

Here are the changes queued up in the block/IO area for 2.6.32. Nothing
totally exciting. Please pull.

  git://git.kernel.dk/linux-2.6-block.git for-2.6.32

Christoph Hellwig (1):
      block: use blkdev_issue_discard in blk_ioctl_discard

David Woodhouse (1):
      Make DISCARD_BARRIER and DISCARD_NOBARRIER writes instead of reads

Ed L. Cashin (1):
      aoe: end barrier bios with EOPNOTSUPP

Eric Dumazet (1):
      cciss: memory leak in cciss_init_one()

Hannes Reinecke (1):
      Send uevents for write_protect changes

Jeff Moyer (1):
      cfq: choose a new next_req when a request is dispatched

Jens Axboe (13):
      cfq-iosched: drain device queue before switching to a sync queue
      block: make bio_rw_flagged() return a bool
      bio: first step in sanitizing the bio->bi_rw flag testing
      block: improve queue_should_plug() by looking at IO depths
      block: add blk-iopoll, a NAPI like approach for block devices
      block: fix long lines in block/blk-iopoll.c
      block: adjust default budget for blk-iopoll
      block: fix comment in blk-iopoll.c
      block: use interrupts disabled version of raise_softirq_irqoff()
      cfq-iosched: get rid of must_alloc flag
      block: make blk_iopoll_prep_sched() follow normal 0/1 return convention
      block: enable rq CPU completion affinity by default
      block: don't assume device has a request list backing in nr_requests store

Marcin Slusarz (1):
      block: use printk_once

Martin K. Petersen (1):
      block: Optimal I/O limit wrapper

Miklos Szeredi (1):
      splice: update mtime and atime on files

Minchan Kim (1):
      block: trace bio queueing trial only when it occurs

Nikanth Karthikesan (1):
      Seperate read and write statistics of in_flight requests

Shan Wei (1):
      cfq: fix the log message after dispatched a request

Tejun Heo (3):
      block: use the same failfast bits for bio and request
      block: implement mixed merge of different failfast requests
      scsi,block: update SCSI to handle mixed merge failures

Vivek Goyal (1):
      cfq-iosched: no need to keep track of busy_rt_queues

 block/Makefile              |    2 +-
 block/blk-barrier.c         |   31 ++++---
 block/blk-core.c            |  166 +++++++++++++++++++++++++------
 block/blk-iopoll.c          |  227 +++++++++++++++++++++++++++++++++++++++++++
 block/blk-merge.c           |   51 ++++++++--
 block/blk-settings.c        |   21 ++++-
 block/blk-sysfs.c           |    7 +-
 block/blk.h                 |    1 +
 block/cfq-iosched.c         |   72 ++++++--------
 block/elevator.c            |   16 +---
 block/genhd.c               |   22 ++++-
 block/ioctl.c               |   49 +---------
 drivers/block/aoe/aoeblk.c  |    3 +
 drivers/block/cciss.c       |    4 +-
 drivers/block/loop.c        |    2 +-
 drivers/block/paride/pcd.c  |   12 +--
 drivers/block/sx8.c         |    4 +-
 drivers/block/viodasd.c     |   12 +--
 drivers/md/dm-raid1.c       |    2 +-
 drivers/md/dm-stripe.c      |    4 +-
 drivers/md/dm.c             |   28 +++---
 drivers/md/linear.c         |    2 +-
 drivers/md/multipath.c      |    4 +-
 drivers/md/raid0.c          |    2 +-
 drivers/md/raid1.c          |   14 ++-
 drivers/md/raid10.c         |    6 +-
 drivers/md/raid5.c          |    2 +-
 drivers/scsi/scsi_lib.c     |    6 +-
 drivers/staging/dst/dcore.c |    5 +-
 fs/btrfs/extent-tree.c      |    3 +-
 fs/btrfs/volumes.c          |    4 +-
 fs/gfs2/rgrp.c              |    6 +-
 fs/partitions/check.c       |   12 ++-
 fs/splice.c                 |    8 +-
 include/linux/bio.h         |   69 ++++++-------
 include/linux/blk-iopoll.h  |   48 +++++++++
 include/linux/blkdev.h      |   44 +++++++--
 include/linux/fs.h          |    4 +-
 include/linux/genhd.h       |   21 +++--
 include/linux/interrupt.h   |    1 +
 kernel/sysctl.c             |   10 ++-
 mm/swapfile.c               |    6 +-
 42 files changed, 729 insertions(+), 284 deletions(-)
 create mode 100644 block/blk-iopoll.c
 create mode 100644 include/linux/blk-iopoll.h

-- 
Jens Axboe

[origin tree build failure] [PATCH] block: remove blk_iopoll_enabled

[Ingo Molnar]

Note, upstream now breaks the build occasionally if CONFIG_BLOCK is 
disabled:

 kernel/built-in.o:(.data+0x17b0): undefined reference to `blk_iopoll_enabled'

Kamalesh Babulal posted a fix for that two weeks ago, i suspect it 
should be picked up - find it below.

	Ingo

-------------------->
>From 3b049b5e648ebfa508d52e9184d1c6c2cd456a72 Mon Sep 17 00:00:00 2001
From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Date: Fri, 21 Aug 2009 16:41:13 +0530
Subject: [PATCH] block: remove blk_iopoll_enabled

* Jens Axboe <jens.axboe@oracle.com> [2009-08-07 21:21:44]:

> On Fri, Aug 07 2009, Randy Dunlap wrote:
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> >
> > New block-iopoll sysctl should be surrounded by CONFIG_BLOCK to
> > prevent build error:
> >
> > kernel/built-in.o:(.data+0x2990): undefined reference to `blk_iopoll_enabled'
>
> Thanks, I'll just kill off this sysctl, it should be driver controller
> anyway. Was just easier for testing :-)

This build failure is still seen with next-20090820 kernel, removing
the sysctl helps. Attaching the patch based on your recommendation.
Please drop the patch if you already have in queue.

Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: akpm <akpm@linux-foundation.org>
Cc: Jens Axboe <jens.axboe@oracle.com>
LKML-Reference: <20090821111113.GA5105@linux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
--
 kernel/sysctl.c |    8 --------
 1 file changed, 8 deletions(-)
---
 kernel/sysctl.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 6bb59f7..95a1805 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -998,14 +998,6 @@ static struct ctl_table kern_table[] = {
 		.proc_handler	= &proc_dointvec,
 	},
 #endif
-	{
-		.ctl_name	= CTL_UNNUMBERED,
-		.procname	= "blk_iopoll",
-		.data		= &blk_iopoll_enabled,
-		.maxlen		= sizeof(int),
-		.mode		= 0644,
-		.proc_handler	= &proc_dointvec,
-	},
 /*
  * NOTE: do not add new entries to this table unless you have read
  * Documentation/sysctl/ctl_unnumbered.txt

Re: [origin tree build failure] [PATCH] block: remove blk_iopoll_enabled

[Jens Axboe]

On Tue, Sep 15 2009, Ingo Molnar wrote:
> 
> Note, upstream now breaks the build occasionally if CONFIG_BLOCK is 
> disabled:
> 
>  kernel/built-in.o:(.data+0x17b0): undefined reference to `blk_iopoll_enabled'
> 
> Kamalesh Babulal posted a fix for that two weeks ago, i suspect it 
> should be picked up - find it below.

Ugh, apparently I fixed that up in the original branch but didn't
propagate that to my for-2.6.32 branch. Will get this fixed up.

-- 
Jens Axboe