Skip to content

Commit 3dd78e5

Browse files
committed
ioctl: delete nvme_zns_append invalid parameters
Since incorrectly copied the nvme_copy parameters. Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
1 parent 3f29f90 commit 3dd78e5

File tree

2 files changed

+9
-16
lines changed

2 files changed

+9
-16
lines changed

src/nvme/ioctl.h

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5402,27 +5402,23 @@ static inline int nvme_zns_report_zones(nvme_link_t l, __u32 nsid, __u64 slba,
54025402
* @nsid: Namespace ID
54035403
* @zslba: Zone start logical block address
54045404
* @nlb: Number of logical blocks
5405-
* @control: Upper 16 bits of cdw12
5406-
* @cev: Command Extension Value
5407-
* @dspec: Directive Specific
5408-
* @lbatm: Logical block application tag mask
5405+
* @control:
54095406
* @lbat: Logical block application tag
5407+
* @lbatm: Logical block application tag mask
54105408
* @ilbrt_u64: Initial logical block reference tag - 8 byte
54115409
* version required for enhanced protection info
5412-
* @metadata: Userspace address of the metadata
5413-
* @metadata_len: Length of @metadata
54145410
* @data: Userspace address of the data
54155411
* @data_len: Length of @data
5412+
* @metadata: Userspace address of the metadata
5413+
* @metadata_len: Length of @metadata
54165414
* @result: The command completion result from CQE dword0
54175415
*
54185416
* Return: 0 on success, the nvme command status if a response was
54195417
* received (see &enum nvme_status_field) or a negative error otherwise.
54205418
*/
5421-
static inline int nvme_zns_append(nvme_link_t l, __u32 nsid, __u64 zslba, __u16 nlb,
5422-
__u16 control, __u16 cev, __u16 dspec,
5423-
__u16 lbat, __u16 lbatm, __u64 ilbrt_u64,
5424-
void *metadata, __u32 metadata_len,
5425-
void *data, __u32 data_len, __u64 *result)
5419+
static inline int nvme_zns_append(nvme_link_t l, __u32 nsid, __u64 zslba, __u16 nlb, __u16 control,
5420+
__u16 lbat, __u16 lbatm, __u64 ilbrt_u64, void *data,
5421+
__u32 data_len, void *metadata, __u32 metadata_len, __u64 *result)
54265422
{
54275423
__u32 cdw3 = (ilbrt_u64 >> 32) & 0xffffffff;
54285424
__u32 cdw10 = zslba & 0xffffffff;

test/ioctl/zns.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ static void test_zns_append(void)
2020
__u64 zslba = TEST_SLBA;
2121
__u64 ilbrt_u64 = 0x76;
2222
__u16 control = 0xcd;
23-
__u16 cev = 0;
24-
__u16 dspec = 0;
2523
__u16 lbatm = 0x98;
2624
__u16 lbat = 0xef;
2725
__u16 nlb = 0xab;
@@ -43,9 +41,8 @@ static void test_zns_append(void)
4341

4442
arbitrary(&expected_data, sizeof(expected_data));
4543
set_mock_io_cmds(&mock_io_cmd, 1);
46-
err = nvme_zns_append(test_link, TEST_NSID, zslba, nlb, control,
47-
cev, dspec, lbat, lbatm, ilbrt_u64,
48-
NULL, 0, &data, sizeof(data), &result);
44+
err = nvme_zns_append(test_link, TEST_NSID, zslba, nlb, control, lbat, lbatm, ilbrt_u64,
45+
&data, sizeof(data), NULL, 0, &result);
4946
end_mock_cmds();
5047
check(err == 0, "returned error %d", err);
5148
check(result == 0, "wrong result");

0 commit comments

Comments
 (0)