From: Jens Axboe Date: Thu, 25 Feb 2010 07:48:05 +0000 (+0100) Subject: Merge branch 'master' into for-2.6.34 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7f03292ee16e68be96aa88904afc6152f8d37736;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'master' into for-2.6.34 Conflicts: include/linux/blkdev.h Signed-off-by: Jens Axboe --- 7f03292ee16e68be96aa88904afc6152f8d37736 diff --cc include/linux/blkdev.h index f71f5c58620c,1896e868854f..2f17793048e7 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@@ -461,9 -461,7 +461,8 @@@ struct request_queu #define QUEUE_FLAG_NONROT 14 /* non-rotational device (SSD) */ #define QUEUE_FLAG_VIRT QUEUE_FLAG_NONROT /* paravirt device */ #define QUEUE_FLAG_IO_STAT 15 /* do IO stats */ - #define QUEUE_FLAG_CQ 16 /* hardware does queuing */ - #define QUEUE_FLAG_DISCARD 17 /* supports DISCARD */ - #define QUEUE_FLAG_NOXMERGES 18 /* No extended merges */ + #define QUEUE_FLAG_DISCARD 16 /* supports DISCARD */ ++#define QUEUE_FLAG_NOXMERGES 17 /* No extended merges */ #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ (1 << QUEUE_FLAG_CLUSTER) | \ @@@ -587,11 -585,8 +586,10 @@@ enum #define blk_queue_plugged(q) test_bit(QUEUE_FLAG_PLUGGED, &(q)->queue_flags) #define blk_queue_tagged(q) test_bit(QUEUE_FLAG_QUEUED, &(q)->queue_flags) - #define blk_queue_queuing(q) test_bit(QUEUE_FLAG_CQ, &(q)->queue_flags) #define blk_queue_stopped(q) test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags) #define blk_queue_nomerges(q) test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags) +#define blk_queue_noxmerges(q) \ + test_bit(QUEUE_FLAG_NOXMERGES, &(q)->queue_flags) #define blk_queue_nonrot(q) test_bit(QUEUE_FLAG_NONROT, &(q)->queue_flags) #define blk_queue_io_stat(q) test_bit(QUEUE_FLAG_IO_STAT, &(q)->queue_flags) #define blk_queue_flushing(q) ((q)->ordseq)