nvme-rdma: fix merge error

Browse source

The merge of 4.12-rc5 into the for-4.13/block tree didn't handle the queue
ready case correctly.  Fix this by propagating blk_status_t into
nvme_rdma_queue_is_ready.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

...

This commit is contained in:

Christoph Hellwig 2017-06-12 18:26:06 +02:00 • committed by Jens Axboe

parent 8f66439eec

commit a104c9f22c

1 changed files with 5 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

drivers/nvme/host/rdma.c

View file