Module Name: src Committed By: martin Date: Thu Jun 14 19:36:53 UTC 2018
Modified Files: src/sbin/fsck_lfs [netbsd-7-1]: bufcache.c bufcache.h Log Message: Pull up following revision(s) (requested by maya in ticket #1612): sbin/fsck_lfs/bufcache.h: revision 1.14 sbin/fsck_lfs/bufcache.c: revision 1.20 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.14 -r1.14.10.1 src/sbin/fsck_lfs/bufcache.c cvs rdiff -u -r1.11 -r1.11.44.1 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.14 src/sbin/fsck_lfs/bufcache.c:1.14.10.1 --- src/sbin/fsck_lfs/bufcache.c:1.14 Sat Oct 19 01:09:58 2013 +++ src/sbin/fsck_lfs/bufcache.c Thu Jun 14 19:36:53 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: bufcache.c,v 1.14 2013/10/19 01:09:58 christos Exp $ */ +/* $NetBSD: bufcache.c,v 1.14.10.1 2018/06/14 19:36:53 martin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. * All rights reserved. @@ -193,7 +193,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.11 src/sbin/fsck_lfs/bufcache.h:1.11.44.1 --- src/sbin/fsck_lfs/bufcache.h:1.11 Fri May 16 09:21:59 2008 +++ src/sbin/fsck_lfs/bufcache.h Thu Jun 14 19:36:53 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: bufcache.h,v 1.11 2008/05/16 09:21:59 hannken Exp $ */ +/* $NetBSD: bufcache.h,v 1.11.44.1 2018/06/14 19:36:53 martin Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -116,7 +116,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);