hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nvmet: fix file discard return status 

If nvmet_copy_from_sgl failed, we falsly return successful
completion status.

Fixes: d5eff33ee6 ("nvmet: add simple file backed ns support")
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Sagi Grimberg 2018-07-11 12:43:16 +03:00 committed by Christoph Hellwig
parent 75862c7232
commit 1b72b71fac
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/nvme/target/io-cmd-file.c
View File

@ -227,22 +227,24 @@ static void nvmet_file_execute_discard(struct nvmet_req *req)
{ {
int mode = FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE; int mode = FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE;
struct nvme_dsm_range range; struct nvme_dsm_range range;
loff_t offset; loff_t offset, len;
loff_t len; u16 ret;
int i, ret; int i;
for (i = 0; i <= le32_to_cpu(req->cmd->dsm.nr); i++) { for (i = 0; i <= le32_to_cpu(req->cmd->dsm.nr); i++) {
if (nvmet_copy_from_sgl(req, i * sizeof(range), &range, ret = nvmet_copy_from_sgl(req, i * sizeof(range), &range,
sizeof(range))) sizeof(range));
if (ret)
break; break;
offset = le64_to_cpu(range.slba) << req->ns->blksize_shift; offset = le64_to_cpu(range.slba) << req->ns->blksize_shift;
len = le32_to_cpu(range.nlb) << req->ns->blksize_shift; len = le32_to_cpu(range.nlb) << req->ns->blksize_shift;
ret = vfs_fallocate(req->ns->file, mode, offset, len); if (vfs_fallocate(req->ns->file, mode, offset, len)) {
if (ret) ret = NVME_SC_INTERNAL | NVME_SC_DNR;
break; break;
}
} }
nvmet_req_complete(req, ret < 0 ? NVME_SC_INTERNAL | NVME_SC_DNR : 0); nvmet_req_complete(req, ret);
} }
static void nvmet_file_dsm_work(struct work_struct *w) static void nvmet_file_dsm_work(struct work_struct *w)