The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=09c20a293280eaed9b4342e08112089f449fd605
commit 09c20a293280eaed9b4342e08112089f449fd605 Author: Warner Losh <[email protected]> AuthorDate: 2023-08-08 16:55:43 +0000 Commit: Warner Losh <[email protected]> CommitDate: 2023-08-08 17:44:51 +0000 nvme: Move bools to fill hole The two bools in nvme_request create a 6 byte hole today. Move them to after retires to fill the 4 byte hole there and add a spare[2] to make nvme_request 8 bytes smaller. spare[2] isn't strictly necessary, but documents how many bytes we have left in that hole, as the number of booleans will increase shortly. Suggested by: chuck Sponsored by: Netflix --- sys/dev/nvme/nvme_private.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 9d82c8fba69c..b35e14cb8d0c 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -119,11 +119,12 @@ struct nvme_request { struct nvme_command cmd; struct nvme_qpair *qpair; struct memdesc payload; - bool payload_valid; - bool timeout; nvme_cb_fn_t cb_fn; void *cb_arg; int32_t retries; + bool payload_valid; + bool timeout; + bool spare[2]; /* Future use */ STAILQ_ENTRY(nvme_request) stailq; };
