Skip to content

Commit

Permalink
nvme: move hardware structures out of the uapi version of nvme.h
Browse files Browse the repository at this point in the history
Currently all NVMe command and completion structures are exposed to userspace
through the uapi version of nvme.h.  They are not an ABI between the kernel
and userspace, and will change in C-incompatible way for future versions of
the spec.  Move them to the kernel version of the file and rename the uapi
header to nvme_ioctl.h so that userspace can easily detect the presence of
the new clean header.  Nvme-cli already carries a local copy of the header,
so it won't be affected by this move.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
  • Loading branch information
Christoph Hellwig authored and Jens Axboe committed Oct 9, 2015
1 parent f11bb3e commit 9d99a8d
Show file tree
Hide file tree
Showing 4 changed files with 590 additions and 591 deletions.
1 change: 1 addition & 0 deletions drivers/block/nvme-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#include <scsi/sg.h>
#include <asm-generic/io-64-nonatomic-lo-hi.h>

#include <uapi/linux/nvme_ioctl.h>
#include "nvme.h"

#define NVME_MINORS (1U << MINORBITS)
Expand Down
Loading

0 comments on commit 9d99a8d

Please sign in to comment.