diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-03-28 11:20:53 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-03-28 11:20:53 -0600 |
| commit | 7bca889ee9297c3e208dee7c41aed7a56a880400 (patch) | |
| tree | 530e42e14e8bc687563cd3f9743026eaa58fecd5 /drivers/nvme/host/tcp.c | |
| parent | dd08a8d9a66de4b54575c294a92630299f7e0fe7 (diff) | |
| parent | a536b49785759bf99465fdf6e248d34322123fcd (diff) | |
Merge branch 'nvme-5.1' of git://git.infradead.org/nvme into for-linusfor-linus-20190329
Pull NVMe fixes from Christoph:
"A few accumulated small fixes:
- fix an endianess misannotation that sneaked in this merge window in
nvme-tcp (me)
- fix nvme-loop to handle multi-page segments (Ming)
- fix error handling in the nvmet configfs code (Max)
- add a missing requeue point in the multipath code (Martin George)"
* 'nvme-5.1' of git://git.infradead.org/nvme:
nvmet: fix error flow during ns enable
nvmet: fix building bvec from sg list
nvme-multipath: relax ANA state check
nvme-tcp: fix an endianess miss-annotation
Diffstat (limited to 'drivers/nvme/host/tcp.c')
| -rw-r--r-- | drivers/nvme/host/tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index e7e08889865e..68c49dd67210 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -627,7 +627,7 @@ static int nvme_tcp_recv_pdu(struct nvme_tcp_queue *queue, struct sk_buff *skb, return ret; } -static inline void nvme_tcp_end_request(struct request *rq, __le16 status) +static inline void nvme_tcp_end_request(struct request *rq, u16 status) { union nvme_result res = {}; |