]> www.infradead.org Git - users/hch/nvme-cli.git/commitdiff
Merge pull request #254 from minwooim/v1.6/remove_nsid_in_error_log
authorKeith Busch <keith.busch@intel.com>
Thu, 11 Jan 2018 21:39:50 +0000 (14:39 -0700)
committerGitHub <noreply@github.com>
Thu, 11 Jan 2018 21:39:50 +0000 (14:39 -0700)
nvme-cli: Remove nsid param in error-log

1  2 
nvme-ioctl.c
nvme-ioctl.h
nvme.c

diff --cc nvme-ioctl.c
Simple merge
diff --cc nvme-ioctl.h
index c9a541f3d158e6961a3230fe1564b2401d4624cc,cfafe5831d600520ddd6820c6eddc1c44cf50523..e562b25b69eaf70435f8db5b796eb325f9950307
@@@ -81,11 -81,9 +81,10 @@@ int nvme_identify_ns_descs(int fd, __u3
  
  int nvme_get_log(int fd, __u32 nsid, __u8 log_id, __u32 data_len, void *data);
  int nvme_fw_log(int fd, struct nvme_firmware_log_page *fw_log);
- int nvme_error_log(int fd, __u32 nsid, int entries,
-                  struct nvme_error_log_page *err_log);
+ int nvme_error_log(int fd, int entries, struct nvme_error_log_page *err_log);
  int nvme_smart_log(int fd, __u32 nsid, struct nvme_smart_log *smart_log);
  int nvme_discovery_log(int fd, struct nvmf_disc_rsp_page_hdr *log, __u32 size);
 +int nvme_sanitize_log(int fd, struct nvme_sanitize_log_page *sanitize_log);
  
  int nvme_feature(int fd, __u8 opcode, __u32 nsid, __u32 cdw10,
                 __u32 cdw11, __u32 data_len, void *data, __u32 *result);
diff --cc nvme.c
Simple merge