Module Name: src
Committed By: christos
Date: Fri Mar 30 12:56:46 UTC 2018
Modified Files:
src/sbin/fsck_lfs: bufcache.c bufcache.h
Log Message:
PR/51418: Jose Luis Rodriguez Garcia: Fix incore src/sbin/fsck_lfs/bufcache.c
XXX: pullup-8, pullup-7
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sbin/fsck_lfs/bufcache.c
cvs rdiff -u -r1.13 -r1.14 src/sbin/fsck_lfs/bufcache.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_lfs/bufcache.c
diff -u src/sbin/fsck_lfs/bufcache.c:1.19 src/sbin/fsck_lfs/bufcache.c:1.20
--- src/sbin/fsck_lfs/bufcache.c:1.19 Thu Aug 25 03:43:18 2016
+++ src/sbin/fsck_lfs/bufcache.c Fri Mar 30 08:56:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bufcache.c,v 1.19 2016/08/25 07:43:18 christos Exp $ */
+/* $NetBSD: bufcache.c,v 1.20 2018/03/30 12:56:46 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -191,7 +191,7 @@ bremfree(struct ubuf * bp)
/* Return a buffer if it is in the cache, otherwise return NULL. */
struct ubuf *
-incore(struct uvnode * vp, int lbn)
+incore(struct uvnode * vp, daddr_t lbn)
{
struct ubuf *bp;
int hash, depth;
Index: src/sbin/fsck_lfs/bufcache.h
diff -u src/sbin/fsck_lfs/bufcache.h:1.13 src/sbin/fsck_lfs/bufcache.h:1.14
--- src/sbin/fsck_lfs/bufcache.h:1.13 Thu Aug 18 04:08:02 2016
+++ src/sbin/fsck_lfs/bufcache.h Fri Mar 30 08:56:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bufcache.h,v 1.13 2016/08/18 08:08:02 christos Exp $ */
+/* $NetBSD: bufcache.h,v 1.14 2018/03/30 12:56:46 christos Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@ void bufrehash(int);
void bufstats(void);
void buf_destroy(struct ubuf *);
void bremfree(struct ubuf *);
-struct ubuf *incore(struct uvnode *, int);
+struct ubuf *incore(struct uvnode *, daddr_t);
struct ubuf *getblk(struct uvnode *, daddr_t, int);
void bwrite(struct ubuf *);
void brelse(struct ubuf *, int);
