diff options
author | Keith Busch <keith.busch@intel.com> | 2013-07-18 14:13:51 -0400 |
---|---|---|
committer | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2013-09-03 16:32:26 -0400 |
commit | 1b56749e541ad59068582f2a28297843e243b856 (patch) | |
tree | 08d2807f404c6a0c83a34b3d28dff448ef6f177c /drivers/block | |
parent | c3bfe7176c035a0a2c70bc79180fb13a6c57142a (diff) |
NVMe: Fix checkpatch issues
Signed-off-by: Keith Busch <keith.busch@intel.com>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/nvme-core.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 56d1fa472d06..f9244131b88a 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c | |||
@@ -451,10 +451,8 @@ static void nvme_bio_pair_endio(struct bio *bio, int err) | |||
451 | 451 | ||
452 | if (atomic_dec_and_test(&bp->cnt)) { | 452 | if (atomic_dec_and_test(&bp->cnt)) { |
453 | bio_endio(bp->parent, bp->err); | 453 | bio_endio(bp->parent, bp->err); |
454 | if (bp->bv1) | 454 | kfree(bp->bv1); |
455 | kfree(bp->bv1); | 455 | kfree(bp->bv2); |
456 | if (bp->bv2) | ||
457 | kfree(bp->bv2); | ||
458 | kfree(bp); | 456 | kfree(bp); |
459 | } | 457 | } |
460 | } | 458 | } |
@@ -1348,7 +1346,8 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) | |||
1348 | c.rw.appmask = cpu_to_le16(io.appmask); | 1346 | c.rw.appmask = cpu_to_le16(io.appmask); |
1349 | 1347 | ||
1350 | if (meta_len) { | 1348 | if (meta_len) { |
1351 | meta_iod = nvme_map_user_pages(dev, io.opcode & 1, io.metadata, meta_len); | 1349 | meta_iod = nvme_map_user_pages(dev, io.opcode & 1, io.metadata, |
1350 | meta_len); | ||
1352 | if (IS_ERR(meta_iod)) { | 1351 | if (IS_ERR(meta_iod)) { |
1353 | status = PTR_ERR(meta_iod); | 1352 | status = PTR_ERR(meta_iod); |
1354 | meta_iod = NULL; | 1353 | meta_iod = NULL; |