From: Keith Busch <keith.busch@intel.com>
Date: Thu, 11 Jan 2018 21:39:50 +0000 (-0700)
Subject: Merge pull request #254 from minwooim/v1.6/remove_nsid_in_error_log
X-Git-Tag: v1.6~129
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0cc6ca1034c1734f3c7ef0638f644aa4308dc82b;p=users%2Fhch%2Fnvme-cli.git

Merge pull request #254 from minwooim/v1.6/remove_nsid_in_error_log

nvme-cli: Remove nsid param in error-log
---

0cc6ca1034c1734f3c7ef0638f644aa4308dc82b
diff --cc nvme-ioctl.h
index c9a541f,cfafe58..e562b25
--- a/nvme-ioctl.h
+++ b/nvme-ioctl.h
@@@ -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);