Commit 1a8e2bdd authored by David Woodhouse's avatar David Woodhouse Committed by Jens Axboe
Browse files

Kill REQ_TYPE_FLUSH 



It was only used by ps3disk, and it should probably have been
REQ_TYPE_LINUX_BLOCK + REQ_LB_OP_FLUSH.

Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent e17fc0a1

drivers/block/ps3disk.c

+6 −3
Original line number Diff line number Diff line
@@ -199,7 +199,8 @@ static void ps3disk_do_request(struct ps3_storage_device *dev, 
		if (blk_fs_request(req)) {

			if (ps3disk_submit_request_sg(dev, req))

				break;

		} else if (req->cmd_type == REQ_TYPE_FLUSH) {

		} else if (req->cmd_type == REQ_TYPE_LINUX_BLOCK &&

			   req->cmd[0] == REQ_LB_OP_FLUSH) {

			if (ps3disk_submit_flush_request(dev, req))

				break;

		} else {
@@ -257,7 +258,8 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data) 
		return IRQ_HANDLED;

	}



	if (req->cmd_type == REQ_TYPE_FLUSH) {

	if (req->cmd_type == REQ_TYPE_LINUX_BLOCK &&

	    req->cmd[0] == REQ_LB_OP_FLUSH) {

		read = 0;

		num_sectors = req->hard_cur_sectors;

		op = "flush";
@@ -405,7 +407,8 @@ static void ps3disk_prepare_flush(struct request_queue *q, struct request *req) 


	dev_dbg(&dev->sbd.core, "%s:%u\n", __func__, __LINE__);



	req->cmd_type = REQ_TYPE_FLUSH;

	req->cmd_type = REQ_TYPE_LINUX_BLOCK;

	req->cmd[0] = REQ_LB_OP_FLUSH;

}



static unsigned long ps3disk_mask;

include/linux/blkdev.h

+1 −5
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ enum rq_cmd_type_bits { 
	REQ_TYPE_PM_SUSPEND,		/* suspend request */

	REQ_TYPE_PM_RESUME,		/* resume request */

	REQ_TYPE_PM_SHUTDOWN,		/* shutdown request */

	REQ_TYPE_FLUSH,			/* flush request */

	REQ_TYPE_SPECIAL,		/* driver defined type */

	REQ_TYPE_LINUX_BLOCK,		/* generic block layer message */

	/*
@@ -76,11 +75,8 @@ enum rq_cmd_type_bits { 
 *

 */

enum {

	/*

	 * just examples for now

	 */

	REQ_LB_OP_EJECT	= 0x40,		/* eject request */

	REQ_LB_OP_FLUSH = 0x41,		/* flush device */

	REQ_LB_OP_FLUSH = 0x41,		/* flush request */

	REQ_LB_OP_DISCARD = 0x42,	/* discard sectors */

};