Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier
Jens Axboe [Tue, 19 Oct 2010 07:13:04 +0000 (09:13 +0200)]
Conflicts:
block/blk-core.c
drivers/block/loop.c
mm/swapfile.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

19 files changed:
1  2 
Documentation/lguest/lguest.c
block/blk-core.c
block/blk.h
block/elevator.c
drivers/block/pktcdvd.c
drivers/block/virtio_blk.c
drivers/block/xen-blkfront.c
drivers/md/md.c
drivers/md/md.h
drivers/md/raid1.c
drivers/scsi/sd.c
fs/gfs2/log.c
fs/nilfs2/the_nilfs.c
fs/xfs/linux-2.6/xfs_buf.c
fs/xfs/linux-2.6/xfs_buf.h
fs/xfs/linux-2.6/xfs_super.c
fs/xfs/xfs_log.c
include/linux/fs.h
mm/swapfile.c

Simple merge
@@@ -1182,15 -1198,13 +1182,15 @@@ static int __make_request(struct reques
        int el_ret;
        unsigned int bytes = bio->bi_size;
        const unsigned short prio = bio_prio(bio);
-       const bool sync = (bio->bi_rw & REQ_SYNC);
-       const bool unplug = (bio->bi_rw & REQ_UNPLUG);
-       const unsigned int ff = bio->bi_rw & REQ_FAILFAST_MASK;
+       const bool sync = !!(bio->bi_rw & REQ_SYNC);
+       const bool unplug = !!(bio->bi_rw & REQ_UNPLUG);
+       const unsigned long ff = bio->bi_rw & REQ_FAILFAST_MASK;
 +      int where = ELEVATOR_INSERT_SORT;
        int rw_flags;
  
 -      if ((bio->bi_rw & REQ_HARDBARRIER) &&
 -          (q->next_ordered == QUEUE_ORDERED_NONE)) {
 +      /* REQ_HARDBARRIER is no more */
 +      if (WARN_ONCE(bio->bi_rw & REQ_HARDBARRIER,
 +              "block: HARDBARRIER is deprecated, use FLUSH/FUA instead\n")) {
                bio_endio(bio, -EOPNOTSUPP);
                return 0;
        }
diff --cc block/blk.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc drivers/md/md.c
Simple merge
diff --cc drivers/md/md.h
Simple merge
Simple merge
Simple merge
diff --cc fs/gfs2/log.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/swapfile.c
Simple merge