Skip to content

Commit d287eac

Browse files
committed
types: use nvme_timestamp for fdp events
The timestamp member of nvme_fdp_event is a proper NVMe Timestamp, so use the actual data structure for it. Signed-off-by: Klaus Jensen <[email protected]>
1 parent 568c5b8 commit d287eac

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

src/nvme/types.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3368,6 +3368,18 @@ struct nvme_fw_commit_event {
33683368
__le16 vndr_assign_fw_commit_rc;
33693369
} __attribute__((packed));
33703370

3371+
/**
3372+
* struct nvme_timestamp - Timestamp - Data Structure for Get Features
3373+
* @timestamp: Timestamp value based on origin and synch field
3374+
* @attr: Attribute
3375+
* @rsvd: Reserved
3376+
*/
3377+
struct nvme_timestamp {
3378+
__u8 timestamp[6];
3379+
__u8 attr;
3380+
__u8 rsvd;
3381+
};
3382+
33713383
/**
33723384
* struct nvme_time_stamp_change_event - Timestamp Change Event
33733385
* @previous_timestamp: Previous Timestamp
@@ -4276,7 +4288,7 @@ enum nvme_fdp_event_flags {
42764288
* @type: Event Type (&enum nvme_fdp_event_type)
42774289
* @flags: Event Flags (&enum nvme_fdp_event_flags)
42784290
* @pid: Placement Identifier
4279-
* @timestamp: Timestamp
4291+
* @ts: Timestamp
42804292
* @nsid: Namespace Identifier
42814293
* @type_specific: Event Type Specific Information
42824294
* @rgid: Reclaim Group Identifier
@@ -4288,7 +4300,7 @@ struct nvme_fdp_event {
42884300
__u8 type;
42894301
__u8 flags;
42904302
__u16 pid;
4291-
__u64 timestamp;
4303+
struct nvme_timestamp ts;
42924304
__u32 nsid;
42934305
__u8 type_specific[16];
42944306
__u16 rgid;
@@ -4513,18 +4525,6 @@ enum nvme_ns_metadata_type {
45134525
NVME_NS_METADATA_OS_NS_QUAL_2 = 0x04,
45144526
};
45154527

4516-
/**
4517-
* struct nvme_timestamp - Timestamp - Data Structure for Get Features
4518-
* @timestamp: Timestamp value based on origin and synch field
4519-
* @attr: Attribute
4520-
* @rsvd: Reserved
4521-
*/
4522-
struct nvme_timestamp {
4523-
__u8 timestamp[6];
4524-
__u8 attr;
4525-
__u8 rsvd;
4526-
};
4527-
45284528
/**
45294529
* struct nvme_lba_range_type_entry - LBA Range Type - Data Structure Entry
45304530
* @type: Specifies the Type of the LBA range

0 commit comments

Comments
 (0)