Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block
Linus Torvalds [Sat, 23 Oct 2010 00:07:18 +0000 (17:07 -0700)]
* '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:
1  2 
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

diff --cc block/Makefile
Simple merge
Simple merge
Simple merge
diff --cc block/blk.h
Simple merge
diff --cc block/ioctl.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc drivers/md/dm.c
Simple merge
diff --cc drivers/md/md.c
Simple merge
Simple merge
diff --cc fs/gfs2/rgrp.c
Simple merge
diff --cc fs/jbd/commit.c
Simple merge
Simple merge
Simple merge
@@@ -146,9 -143,9 +146,8 @@@ enum rq_flag_bits 
        __REQ_FAILED,           /* set if the request failed */
        __REQ_QUIET,            /* don't worry about errors */
        __REQ_PREEMPT,          /* set for "ide_preempt" requests */
-       __REQ_ORDERED_COLOR,    /* is before or after barrier */
        __REQ_ALLOCED,          /* request came from our alloc pool */
        __REQ_COPY_USER,        /* contains copies of user pages */
 -      __REQ_INTEGRITY,        /* integrity metadata has been remapped */
        __REQ_FLUSH,            /* request for cache flush */
        __REQ_IO_STAT,          /* account I/O stat */
        __REQ_MIXED_MERGE,      /* merge of different types, fail separately */
  #define REQ_FAILED            (1 << __REQ_FAILED)
  #define REQ_QUIET             (1 << __REQ_QUIET)
  #define REQ_PREEMPT           (1 << __REQ_PREEMPT)
- #define REQ_ORDERED_COLOR     (1 << __REQ_ORDERED_COLOR)
  #define REQ_ALLOCED           (1 << __REQ_ALLOCED)
  #define REQ_COPY_USER         (1 << __REQ_COPY_USER)
 -#define REQ_INTEGRITY         (1 << __REQ_INTEGRITY)
  #define REQ_FLUSH             (1 << __REQ_FLUSH)
  #define REQ_IO_STAT           (1 << __REQ_IO_STAT)
  #define REQ_MIXED_MERGE               (1 << __REQ_MIXED_MERGE)
Simple merge
Simple merge