Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Oct 2010 00:07:18 +0000 (17:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Oct 2010 00:07:18 +0000 (17:07 -0700)
commita2887097f25cd38cadfc11d10769e2b349fb5eca
treecd4adcb305365d6ba9acd2c02d4eb9d0125c6f8d
parent8abfc6e7a45eb74e51904bbae676fae008b11366
parent005a1d15f5a6b2bb4ada80349513effbf22b4588
Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block

* 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block: (46 commits)
  xen-blkfront: disable barrier/flush write support
  Added blk-lib.c and blk-barrier.c was renamed to blk-flush.c
  block: remove BLKDEV_IFL_WAIT
  aic7xxx_old: removed unused 'req' variable
  block: remove the BH_Eopnotsupp flag
  block: remove the BLKDEV_IFL_BARRIER flag
  block: remove the WRITE_BARRIER flag
  swap: do not send discards as barriers
  fat: do not send discards as barriers
  ext4: do not send discards as barriers
  jbd2: replace barriers with explicit flush / FUA usage
  jbd2: Modify ASYNC_COMMIT code to not rely on queue draining on barrier
  jbd: replace barriers with explicit flush / FUA usage
  nilfs2: replace barriers with explicit flush / FUA usage
  reiserfs: replace barriers with explicit flush / FUA usage
  gfs2: replace barriers with explicit flush / FUA usage
  btrfs: replace barriers with explicit flush / FUA usage
  xfs: replace barriers with explicit flush / FUA usage
  block: pass gfp_mask and flags to sb_issue_discard
  dm: convey that all flushes are processed as empty
  ...
24 files changed:
block/Makefile
block/blk-core.c
block/blk-settings.c
block/blk.h
block/ioctl.c
drivers/block/brd.c
drivers/block/drbd/drbd_int.h
drivers/block/drbd/drbd_receiver.c
drivers/block/loop.c
drivers/block/pktcdvd.c
drivers/block/ps3disk.c
drivers/block/virtio_blk.c
drivers/block/xen-blkfront.c
drivers/md/dm-snap.c
drivers/md/dm.c
drivers/md/md.c
drivers/s390/block/dasd.c
fs/gfs2/rgrp.c
fs/jbd/commit.c
fs/jbd2/commit.c
fs/nilfs2/super.c
include/linux/blk_types.h
include/linux/blkdev.h
include/linux/fs.h