d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nda(4): Remove unnecessary union and avoid Clang -Wsizeof-array-divwarning

Browse Source 
Clang trunk recently gained this new warning, and complains about the
sizeof(trim->data) / sizeof(struct nvme_dsm_range) expression, since
the left hand side's element type (char) does not match the right hand
side's type. The byte buffer is unnecessary so we can remove it to clean
up the code and fix the warning at the same time.

No functional change.

Submitted by:	James Clarke <jrtc27@jrtc27.com>
Reviewed by:	imp
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D21912
This commit is contained in:
Brooks Davis 2019-10-24 22:23:53 +00:00
parent 619456bb59
commit 93489854f4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=354054
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/cam/nvme/nvme_da.c
View File

@ -129,12 +129,11 @@ struct nda_softc {
};
struct nda_trim_request {
union {
struct nvme_dsm_range dsm;
uint8_t data[NVME_MAX_DSM_TRIM];
};
struct nvme_dsm_range dsm[NVME_MAX_DSM_TRIM / sizeof(struct nvme_dsm_range)];
TAILQ_HEAD(, bio) bps;
};
_Static_assert(NVME_MAX_DSM_TRIM % sizeof(struct nvme_dsm_range) == 0,
"NVME_MAX_DSM_TRIM must be an integral number of ranges");
/* Need quirk table */
@ -957,9 +956,8 @@ ndastart(struct cam_periph *periph, union ccb *start_ccb)
}
TAILQ_INIT(&trim->bps);
bp1 = bp;
ents = sizeof(trim->data) / sizeof(struct nvme_dsm_range);
ents = min(ents, nda_max_trim_entries);
dsm_range = &trim->dsm;
ents = min(nitems(trim->dsm), nda_max_trim_entries);
dsm_range = trim->dsm;
dsm_end = dsm_range + ents;
do {
TAILQ_INSERT_TAIL(&trim->bps, bp1, bio_queue);
@ -977,8 +975,8 @@ ndastart(struct cam_periph *periph, union ccb *start_ccb)
/* XXX -- Could limit based on total payload size */
} while (bp1 != NULL);
start_ccb->ccb_trim = trim;
nda_nvme_trim(softc, &start_ccb->nvmeio, &trim->dsm,
dsm_range - &trim->dsm);
nda_nvme_trim(softc, &start_ccb->nvmeio, trim->dsm,
dsm_range - trim->dsm);
start_ccb->ccb_state = NDA_CCB_TRIM;
softc->trim_count++;
softc->trim_ranges += ranges;