diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2019-04-11 09:36:41 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-04-11 09:36:41 -0600 |
| commit | c0c14e935032abd6ee6828840a83df1de49d4838 (patch) | |
| tree | 6e5d46c670e1ed35f4cddadfec3f7b8c563d23cb /include/linux | |
| parent | block: do not leak memory in bio_copy_user_iov() (diff) | |
| parent | nvmet: fix discover log page when offsets are used (diff) | |
| download | wireguard-linux-c0c14e935032abd6ee6828840a83df1de49d4838.tar.xz wireguard-linux-c0c14e935032abd6ee6828840a83df1de49d4838.zip | |
Merge branch 'nvme-5.1' of git://git.infradead.org/nvme into for-linus
Pull NVMe fixes from Christoph:
"Two nvme fixes for 5.1 - fixing the initial CSN for nvme-fc, and handle
log page offsets properly in the target."
* 'nvme-5.1' of git://git.infradead.org/nvme:
nvmet: fix discover log page when offsets are used
nvme-fc: correct csn initialization and increments on error
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nvme.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index baa49e6a23cc..c40720cb59ac 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -967,8 +967,13 @@ struct nvme_get_log_page_command { __le16 numdl; __le16 numdu; __u16 rsvd11; - __le32 lpol; - __le32 lpou; + union { + struct { + __le32 lpol; + __le32 lpou; + }; + __le64 lpo; + }; __u32 rsvd14[2]; }; |