From: Jens Axboe <jaxboe@fusionio.com>
Date: Tue, 19 Oct 2010 07:13:04 +0000 (+0200)
Subject: Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fa251f89903d73989e2f63e13d0eaed1e07ce0da;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier

Conflicts:
	block/blk-core.c
	drivers/block/loop.c
	mm/swapfile.c

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

fa251f89903d73989e2f63e13d0eaed1e07ce0da
diff --cc block/blk-core.c
index 2a5b19204546,32a1c123dfb3..a840523e3b40
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@@ -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;
  	}