Module Name: src
Committed By: jakllsch
Date: Thu Feb 6 20:10:25 UTC 2025
Modified Files:
src/sys/dev: dksubr.c
Log Message:
off_t is closer to long than it is to unsigned int; so use lmin()
rather than uimin()
Avoids incorrectling telling dk_translate() we're trying to do nothing.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/dev/dksubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dksubr.c
diff -u src/sys/dev/dksubr.c:1.115 src/sys/dev/dksubr.c:1.116
--- src/sys/dev/dksubr.c:1.115 Thu Feb 6 20:07:19 2025
+++ src/sys/dev/dksubr.c Thu Feb 6 20:10:25 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.115 2025/02/06 20:07:19 jakllsch Exp $ */
+/* $NetBSD: dksubr.c,v 1.116 2025/02/06 20:10:25 jakllsch Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.115 2025/02/06 20:07:19 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.116 2025/02/06 20:10:25 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -525,7 +525,7 @@ dk_discard(struct dk_softc *dksc, dev_t
bp->b_error = 0;
bp->b_dev = dev;
bp->b_blkno = (daddr_t)(pos / secsize);
- bp->b_bcount = uimin(len, maxsz);
+ bp->b_bcount = lmin(len, maxsz);
bp->b_flags = B_WRITE;
error = dk_translate(dksc, bp);
