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

Commit 4917fa29 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Jens Axboe
Browse files

block: no need to initialize rq->cmd in prepare_flush_fn hook 



The block layer initializes rq->cmd (queue_flush calls rq_init) so
prepare_flush_fn hooks don't need to do that.

The purpose of this patch is to remove sizeof(rq->cmd), as a
preparation for large command support, which changes rq->cmd from the
static array to a pointer. sizeof(rq->cmd) will not make sense.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 6f6a036e

drivers/block/ps3disk.c

+0 −1
Original line number Diff line number Diff line
@@ -405,7 +405,6 @@ static void ps3disk_prepare_flush(struct request_queue *q, struct request *req) 


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



	memset(req->cmd, 0, sizeof(req->cmd));

	req->cmd_type = REQ_TYPE_FLUSH;

}

drivers/scsi/sd.c

+0 −1
Original line number Diff line number Diff line
@@ -860,7 +860,6 @@ static int sd_sync_cache(struct scsi_disk *sdkp) 


static void sd_prepare_flush(struct request_queue *q, struct request *rq)

{

	memset(rq->cmd, 0, sizeof(rq->cmd));

	rq->cmd_type = REQ_TYPE_BLOCK_PC;

	rq->timeout = SD_TIMEOUT;

	rq->cmd[0] = SYNCHRONIZE_CACHE;