diff options
| author | Keith Busch <keith.busch@intel.com> | 2015-12-03 17:32:21 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-12-03 17:32:21 +0100 |
| commit | 06c1e3902aa74b7432a7e82bb4a5aca233a42839 (patch) | |
| tree | 92372a5b1038eaa0ccbea92bf5f8625734ffd98f /drivers/nvme | |
| parent | nvme: refactor set_queue_count (diff) | |
| download | linux-06c1e3902aa74b7432a7e82bb4a5aca233a42839.tar.xz linux-06c1e3902aa74b7432a7e82bb4a5aca233a42839.zip | |
blk-integrity: empty implementation when disabled
This patch moves the blk_integrity_payload definition outside the
CONFIG_BLK_DEV_INTERITY dependency and provides empty function
implementations when the kernel configuration disables integrity
extensions. This simplifies drivers that make use of these to map user
data so they don't need to repeat the same configuration checks.
Signed-off-by: Keith Busch <keith.busch@intel.com>
Updated by Jens to pass an error pointer return from
bio_integrity_alloc(), otherwise if CONFIG_BLK_DEV_INTEGRITY isn't
set, we return a weird ENOMEM from __nvme_submit_user_cmd()
if a meta buffer is set.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index c61bde9921d2..f9c4e80c2441 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -190,8 +190,8 @@ int __nvme_submit_user_cmd(struct request_queue *q, struct nvme_command *cmd, } bip = bio_integrity_alloc(bio, GFP_KERNEL, 1); - if (!bip) { - ret = -ENOMEM; + if (IS_ERR(bip)) { + ret = PTR_ERR(bip); goto out_free_meta; } |