svn commit: r328075 - head/sbin/fsck_ffs

[O. Hartmann]

On Wed, 17 Jan 2018 06:31:21 +0000 (UTC)
Kirk McKusick <mckusick at FreeBSD.org> wrote:

> Author: mckusick
> Date: Wed Jan 17 06:31:21 2018
> New Revision: 328075
> URL: https://svnweb.freebsd.org/changeset/base/328075
> 
> Log:
>   Rename cgget => cglookup to clear name space for new libufs function cgget.
>   No functional change.
> 
> Modified:
>   head/sbin/fsck_ffs/fsck.h
>   head/sbin/fsck_ffs/fsutil.c
>   head/sbin/fsck_ffs/inode.c
>   head/sbin/fsck_ffs/pass1.c
>   head/sbin/fsck_ffs/pass5.c
> 
> Modified: head/sbin/fsck_ffs/fsck.h
> ==============================================================================
> --- head/sbin/fsck_ffs/fsck.h	Wed Jan 17 06:22:10 2018	(r328074)
> +++ head/sbin/fsck_ffs/fsck.h	Wed Jan 17 06:31:21 2018	(r328075)
> @@ -437,7 +437,7 @@ void		freeinodebuf(void);
>  void		fsutilinit(void);
>  int		ftypeok(union dinode *dp);
>  void		getblk(struct bufarea *bp, ufs2_daddr_t blk, long size);
> -struct bufarea *cgget(int cg);
> +struct bufarea *cglookup(int cg);
>  struct bufarea *getdatablk(ufs2_daddr_t blkno, long size, int type);
>  struct inoinfo *getinoinfo(ino_t inumber);
>  union dinode   *getnextinode(ino_t inumber, int rebuildcg);
> 
> Modified: head/sbin/fsck_ffs/fsutil.c
> ==============================================================================
> --- head/sbin/fsck_ffs/fsutil.c	Wed Jan 17 06:22:10 2018
> (r328074) +++ head/sbin/fsck_ffs/fsutil.c	Wed Jan 17 06:31:21
> 2018	(r328075) @@ -222,7 +222,7 @@ static struct bufarea
> *cgbufs;	/* header for cylinder static int
> flushtries;		/* number of tries to reclaim memory */ 
>  struct bufarea *
> -cgget(int cg)
> +cglookup(int cg)
>  {
>  	struct bufarea *cgbp;
>  	struct cg *cgp;
> @@ -791,7 +791,7 @@ allocblk(long frags)
>  				continue;
>  			}
>  			cg = dtog(&sblock, i + j);
> -			cgbp = cgget(cg);
> +			cgbp = cglookup(cg);
>  			cgp = cgbp->b_un.b_cg;
>  			if (!check_cgmagic(cg, cgbp))
>  				return (0);
> 
> Modified: head/sbin/fsck_ffs/inode.c
> ==============================================================================
> --- head/sbin/fsck_ffs/inode.c	Wed Jan 17 06:22:10 2018
> (r328074) +++ head/sbin/fsck_ffs/inode.c	Wed Jan 17 06:31:21
> 2018	(r328075) @@ -673,7 +673,7 @@ allocino(ino_t request, int type)
>  	if (ino == maxino)
>  		return (0);
>  	cg = ino_to_cg(&sblock, ino);
> -	cgbp = cgget(cg);
> +	cgbp = cglookup(cg);
>  	cgp = cgbp->b_un.b_cg;
>  	if (!check_cgmagic(cg, cgbp))
>  		return (0);
> 
> Modified: head/sbin/fsck_ffs/pass1.c
> ==============================================================================
> --- head/sbin/fsck_ffs/pass1.c	Wed Jan 17 06:22:10 2018
> (r328074) +++ head/sbin/fsck_ffs/pass1.c	Wed Jan 17 06:31:21
> 2018	(r328075) @@ -98,7 +98,7 @@ pass1(void)
>  	for (c = 0; c < sblock.fs_ncg; c++) {
>  		inumber = c * sblock.fs_ipg;
>  		setinodebuf(inumber);
> -		cgbp = cgget(c);
> +		cgbp = cglookup(c);
>  		cgp = cgbp->b_un.b_cg;
>  		rebuildcg = 0;
>  		if (!check_cgmagic(c, cgbp))
> 
> Modified: head/sbin/fsck_ffs/pass5.c
> ==============================================================================
> --- head/sbin/fsck_ffs/pass5.c	Wed Jan 17 06:22:10 2018
> (r328074) +++ head/sbin/fsck_ffs/pass5.c	Wed Jan 17 06:31:21
> 2018	(r328075) @@ -174,7 +174,7 @@ pass5(void)
>  			    c * 100 / sblock.fs_ncg);
>  			got_sigalarm = 0;
>  		}
> -		cgbp = cgget(c);
> +		cgbp = cglookup(c);
>  		cg = cgbp->b_un.b_cg;
>  		if (!cg_chkmagic(cg))
>  			pfatal("CG %d: BAD MAGIC NUMBER\n", c);
> _______________________________________________
> svn-src-head at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"


This breaks buildworld for me:

[...]
===> sbin/fsdb (all)
--- all_subdir_rescue ---
`pkill.o' is up to date.
--- ps_make ---
(cd /usr/src/rescue/rescue/../../bin/ps &&  make -DRESCUE
CRUNCH_CFLAGS=-DRESCUE MK_AUTO_OBJ=yes DIRPRFX=rescue/rescue/ps/ fmt.o
keyword.o nlist.o print.o ps.o) --- all_subdir_sbin ---
Building /usr/obj/usr/src/amd64.amd64/sbin/fsdb/fsdb --- fsdb ---
/usr/obj/usr/src/amd64.amd64/tmp/usr/bin/ld: error: undefined symbol: cgget
>>> referenced by fsdb.c
>>>               fsdb.o:(findblk)
cc: error: linker command failed with exit code 1 (use -v to see invocation)
*** [fsdb] Error code 1