From ab9ad61f9a8cac2e085ce8d5bd36a50294ecce38 Mon Sep 17 00:00:00 2001 From: Kirk McKusick Date: Sun, 31 Dec 1989 06:46:51 -0800 Subject: [PATCH] badblock moves into this file SCCS-vsn: sys/ufs/ffs/ffs_alloc.c 7.15 SCCS-vsn: sys/ufs/lfs/lfs_alloc.c 7.15 --- usr/src/sys/ufs/ffs/ffs_alloc.c | 18 +++++++++++++++++- usr/src/sys/ufs/lfs/lfs_alloc.c | 18 +++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/usr/src/sys/ufs/ffs/ffs_alloc.c b/usr/src/sys/ufs/ffs/ffs_alloc.c index 872d059769..8b6c6e8efe 100644 --- a/usr/src/sys/ufs/ffs/ffs_alloc.c +++ b/usr/src/sys/ufs/ffs/ffs_alloc.c @@ -14,7 +14,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)ffs_alloc.c 7.14 (Berkeley) %G% + * @(#)ffs_alloc.c 7.15 (Berkeley) %G% */ #include "param.h" @@ -1087,6 +1087,22 @@ mapsearch(fs, cgp, bpref, allocsiz) return (-1); } +/* + * Check that a specified block number is in range. + */ +badblock(fs, bn) + register struct fs *fs; + daddr_t bn; +{ + + if ((unsigned)bn >= fs->fs_size) { + printf("bad block %d, ", bn); + fserr(fs, "bad block"); + return (1); + } + return (0); +} + /* * Fserr prints the name of a file system with an error diagnostic. * diff --git a/usr/src/sys/ufs/lfs/lfs_alloc.c b/usr/src/sys/ufs/lfs/lfs_alloc.c index dc1827c115..4e523bd21d 100644 --- a/usr/src/sys/ufs/lfs/lfs_alloc.c +++ b/usr/src/sys/ufs/lfs/lfs_alloc.c @@ -14,7 +14,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)lfs_alloc.c 7.14 (Berkeley) %G% + * @(#)lfs_alloc.c 7.15 (Berkeley) %G% */ #include "param.h" @@ -1087,6 +1087,22 @@ mapsearch(fs, cgp, bpref, allocsiz) return (-1); } +/* + * Check that a specified block number is in range. + */ +badblock(fs, bn) + register struct fs *fs; + daddr_t bn; +{ + + if ((unsigned)bn >= fs->fs_size) { + printf("bad block %d, ", bn); + fserr(fs, "bad block"); + return (1); + } + return (0); +} + /* * Fserr prints the name of a file system with an error diagnostic. * -- 2.20.1