[src/netbsd-7]: src/sbin/fsck_lfs Pull up following revision(s) (requested by...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/19e3f2e9e8e4
branches:  netbsd-7
changeset: 800488:19e3f2e9e8e4
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Jun 06 15:38:05 2018 +0000

description:
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

diffstat:

 sbin/fsck_lfs/bufcache.c |  4 ++--
 sbin/fsck_lfs/bufcache.h |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r fcd845ae1cbc -r 19e3f2e9e8e4 sbin/fsck_lfs/bufcache.c
--- a/sbin/fsck_lfs/bufcache.c  Wed Jun 06 15:31:58 2018 +0000
+++ b/sbin/fsck_lfs/bufcache.c  Wed Jun 06 15:38:05 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bufcache.c,v 1.14 2013/10/19 01:09:58 christos Exp $ */
+/* $NetBSD: bufcache.c,v 1.14.4.1 2018/06/06 15:38:05 martin Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -193,7 +193,7 @@
 
 /* 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;
diff -r fcd845ae1cbc -r 19e3f2e9e8e4 sbin/fsck_lfs/bufcache.h
--- a/sbin/fsck_lfs/bufcache.h  Wed Jun 06 15:31:58 2018 +0000
+++ b/sbin/fsck_lfs/bufcache.h  Wed Jun 06 15:38:05 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bufcache.h,v 1.11 2008/05/16 09:21:59 hannken Exp $    */
+/*     $NetBSD: bufcache.h,v 1.11.38.1 2018/06/06 15:38:05 martin Exp $        */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@
 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);