Page MenuHomeFreeBSD
Files F110720831

D27081.diff
No OneTemporary
Actions

D27081.diff
View Options

Index: head/sys/geom/geom.h
===================================================================
--- head/sys/geom/geom.h
+++ head/sys/geom/geom.h
@@ -334,7 +334,8 @@
int g_io_getattr(const char *attr, struct g_consumer *cp, int *len, void *ptr);
int g_io_zonecmd(struct disk_zone_args *zone_args, struct g_consumer *cp);
int g_io_flush(struct g_consumer *cp);
-int g_io_speedup(size_t shortage, u_int flags, size_t *resid, struct g_consumer *cp);
+int g_io_speedup(off_t shortage, u_int flags, size_t *resid,
+ struct g_consumer *cp);
void g_io_request(struct bio *bp, struct g_consumer *cp);
struct bio *g_new_bio(void);
struct bio *g_alloc_bio(void);
Index: head/sys/geom/geom_io.c
===================================================================
--- head/sys/geom/geom_io.c
+++ head/sys/geom/geom_io.c
@@ -341,15 +341,15 @@
* operation should be done.
*/
int
-g_io_speedup(size_t shortage, u_int flags, size_t *resid, struct g_consumer *cp)
+g_io_speedup(off_t shortage, u_int flags, size_t *resid, struct g_consumer *cp)
{
struct bio *bp;
int error;
KASSERT((flags & (BIO_SPEEDUP_TRIM | BIO_SPEEDUP_WRITE)) != 0,
("Invalid flags passed to g_io_speedup: %#x", flags));
- g_trace(G_T_BIO, "bio_speedup(%s, %zu, %#x)", cp->provider->name,
- shortage, flags);
+ g_trace(G_T_BIO, "bio_speedup(%s, %jd, %#x)", cp->provider->name,
+ (intmax_t)shortage, flags);
bp = g_new_bio();
if (bp == NULL)
return (ENOMEM);
Index: head/sys/ufs/ffs/ffs_softdep.c
===================================================================
--- head/sys/ufs/ffs/ffs_softdep.c
+++ head/sys/ufs/ffs/ffs_softdep.c
@@ -1464,7 +1464,7 @@
}
static void
-softdep_send_speedup(struct ufsmount *ump, size_t shortage, u_int flags)
+softdep_send_speedup(struct ufsmount *ump, off_t shortage, u_int flags)
{
struct buf *bp;
@@ -1474,7 +1474,7 @@
bp = malloc(sizeof(*bp), M_TRIM, M_WAITOK | M_ZERO);
bp->b_iocmd = BIO_SPEEDUP;
bp->b_ioflags = flags;
- bp->b_bcount = shortage;
+ bp->b_bcount = omin(shortage, LONG_MAX);
g_vfs_strategy(ump->um_bo, bp);
bufwait(bp);
free(bp, M_TRIM);

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 23, 7:59 AM (7 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16790814
Default Alt Text
D27081.diff (2 KB)

Event Timeline