Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8afdd94c authored by Jens Axboe's avatar Jens Axboe
Browse files

mtip32xx: kill atomic argument to mtip_quiesce_io() 



All callers now pass in GFP_KERNEL, get rid of the argument.

Reviewed-by: default avatarBart Van Assche <Bart.VanAssche@sandisk.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 0f6422a2

drivers/block/mtip32xx/mtip32xx.c

+5 −15
Original line number Diff line number Diff line
@@ -1035,14 +1035,12 @@ static bool mtip_pause_ncq(struct mtip_port *port, 
 *

 * @port    Pointer to port data structure

 * @timeout Max duration to wait (ms)

 * @atomic  gfp_t flag to indicate blockable context or not

 *

 * return value

 *	0	Success

 *	-EBUSY  Commands still active

 */

static int mtip_quiesce_io(struct mtip_port *port, unsigned long timeout,

								gfp_t atomic)

static int mtip_quiesce_io(struct mtip_port *port, unsigned long timeout)

{

	unsigned long to;

	unsigned int n;
@@ -1053,18 +1051,12 @@ static int mtip_quiesce_io(struct mtip_port *port, unsigned long timeout, 
	to = jiffies + msecs_to_jiffies(timeout);

	do {

		if (test_bit(MTIP_PF_SVC_THD_ACTIVE_BIT, &port->flags) &&

			test_bit(MTIP_PF_ISSUE_CMDS_BIT, &port->flags) &&

			atomic == GFP_KERNEL) {

			test_bit(MTIP_PF_ISSUE_CMDS_BIT, &port->flags)) {

			msleep(20);

			continue; /* svc thd is actively issuing commands */

		}



		if (atomic == GFP_KERNEL)

		msleep(100);

		else {

			cpu_relax();

			udelay(100);

		}



		if (mtip_check_surprise_removal(port->dd->pdev))

			goto err_fault;
@@ -1142,8 +1134,7 @@ static int mtip_exec_internal_command(struct mtip_port *port, 


	if (fis->command != ATA_CMD_STANDBYNOW1) {

		/* wait for io to complete if non atomic */

		if (mtip_quiesce_io(port,

			MTIP_QUIESCE_IO_TIMEOUT_MS, GFP_KERNEL) < 0) {

		if (mtip_quiesce_io(port, MTIP_QUIESCE_IO_TIMEOUT_MS) < 0) {

			dev_warn(&dd->pdev->dev, "Failed to quiesce IO\n");

			mtip_put_int_command(dd, int_cmd);

			clear_bit(MTIP_PF_IC_ACTIVE_BIT, &port->flags);
@@ -4106,8 +4097,7 @@ static int mtip_block_remove(struct driver_data *dd) 
		 * Explicitly wait here for IOs to quiesce,

		 * as mtip_standby_drive usually won't wait for IOs.

		 */

		if (!mtip_quiesce_io(dd->port, MTIP_QUIESCE_IO_TIMEOUT_MS,

								GFP_KERNEL))

		if (!mtip_quiesce_io(dd->port, MTIP_QUIESCE_IO_TIMEOUT_MS))

			mtip_standby_drive(dd);

	}

	else