iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtip32xx: return a blk_status_t from mtip_send_trim

Browse Source 
This allows for better error propagation and simpler code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2018-11-09 14:48:56 +01:00 committed by Jens Axboe
parent 10966fa138
commit 81e66174ab
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/block/mtip32xx/mtip32xx.c
View File

@ -1423,23 +1423,19 @@ static int mtip_get_smart_attr(struct mtip_port *port, unsigned int id,
* @dd pointer to driver_data structure * @dd pointer to driver_data structure
* @lba starting lba * @lba starting lba
* @len # of 512b sectors to trim * @len # of 512b sectors to trim
*
* return value
* -ENOMEM Out of dma memory
* -EINVAL Invalid parameters passed in, trim not supported
* -EIO Error submitting trim request to hw
*/ */
static int mtip_send_trim(struct driver_data *dd, unsigned int lba, static blk_status_t mtip_send_trim(struct driver_data *dd, unsigned int lba,
unsigned int len) unsigned int len)
{ {
int i, rv = 0;
u64 tlba, tlen, sect_left; u64 tlba, tlen, sect_left;
struct mtip_trim_entry *buf; struct mtip_trim_entry *buf;
dma_addr_t dma_addr; dma_addr_t dma_addr;
struct host_to_dev_fis fis; struct host_to_dev_fis fis;
blk_status_t ret = BLK_STS_OK;
int i;
if (!len || dd->trim_supp == false) if (!len || dd->trim_supp == false)
return -EINVAL; return BLK_STS_IOERR;
/* Trim request too big */ /* Trim request too big */
WARN_ON(len > (MTIP_MAX_TRIM_ENTRY_LEN * MTIP_MAX_TRIM_ENTRIES)); WARN_ON(len > (MTIP_MAX_TRIM_ENTRY_LEN * MTIP_MAX_TRIM_ENTRIES));
@ -1454,7 +1450,7 @@ static int mtip_send_trim(struct driver_data *dd, unsigned int lba,
buf = dmam_alloc_coherent(&dd->pdev->dev, ATA_SECT_SIZE, &dma_addr, buf = dmam_alloc_coherent(&dd->pdev->dev, ATA_SECT_SIZE, &dma_addr,
GFP_KERNEL); GFP_KERNEL);
if (!buf) if (!buf)
return -ENOMEM; return BLK_STS_RESOURCE;
memset(buf, 0, ATA_SECT_SIZE); memset(buf, 0, ATA_SECT_SIZE);
for (i = 0, sect_left = len, tlba = lba; for (i = 0, sect_left = len, tlba = lba;
@ -1486,10 +1482,10 @@ static int mtip_send_trim(struct driver_data *dd, unsigned int lba,
ATA_SECT_SIZE, ATA_SECT_SIZE,
0, 0,
MTIP_TRIM_TIMEOUT_MS) < 0) MTIP_TRIM_TIMEOUT_MS) < 0)
rv = -EIO; ret = BLK_STS_IOERR;
dmam_free_coherent(&dd->pdev->dev, ATA_SECT_SIZE, buf, dma_addr); dmam_free_coherent(&dd->pdev->dev, ATA_SECT_SIZE, buf, dma_addr);
return rv; return ret;
} }
/* /*
@ -3634,13 +3630,9 @@ static blk_status_t mtip_queue_rq(struct blk_mq_hw_ctx *hctx,
blk_mq_start_request(rq); blk_mq_start_request(rq);
if (req_op(rq) == REQ_OP_DISCARD) { if (req_op(rq) == REQ_OP_DISCARD)
if (mtip_send_trim(dd, blk_rq_pos(rq), blk_rq_sectors(rq)) < 0) return mtip_send_trim(dd, blk_rq_pos(rq), blk_rq_sectors(rq));
return BLK_STS_IOERR; mtip_hw_submit_io(dd, rq, cmd, hctx);
} else {
mtip_hw_submit_io(dd, rq, cmd, hctx);
}
return BLK_STS_OK; return BLK_STS_OK;
} }