aboutsummaryrefslogtreecommitdiffstats
path: root/sbin/fsck_ffs
diff options
context:
space:
mode:
authorKirk McKusick <mckusick@FreeBSD.org>2018-01-17 06:31:21 +0000
committerKirk McKusick <mckusick@FreeBSD.org>2018-01-17 06:31:21 +0000
commit957fc241ec2e2a3b87f53d0b0d80c75c752f7e8d (patch)
tree6525360b53e00926db347a110990f14f9d4c7e9a /sbin/fsck_ffs
parent84d6a5d4a78a8bf451463c87f3c38f8854e53afa (diff)
downloadsrc-957fc241ec2e2a3b87f53d0b0d80c75c752f7e8d.tar.gz
src-957fc241ec2e2a3b87f53d0b0d80c75c752f7e8d.zip
Rename cgget => cglookup to clear name space for new libufs function cgget.
No functional change.
Notes
Notes: svn path=/head/; revision=328075
Diffstat (limited to 'sbin/fsck_ffs')
-rw-r--r--sbin/fsck_ffs/fsck.h2
-rw-r--r--sbin/fsck_ffs/fsutil.c4
-rw-r--r--sbin/fsck_ffs/inode.c2
-rw-r--r--sbin/fsck_ffs/pass1.c2
-rw-r--r--sbin/fsck_ffs/pass5.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index 9969587284bf..aebd78d1150b 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -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);
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index f426200be118..78610a4c2f30 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -222,7 +222,7 @@ static struct bufarea *cgbufs; /* header for cylinder group cache */
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);
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index 67c8440a2013..34153d6111fd 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -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);
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 40d855896f06..aa4fc4915399 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -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))
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c
index db45f4815e82..6876f859140e 100644
--- a/sbin/fsck_ffs/pass5.c
+++ b/sbin/fsck_ffs/pass5.c
@@ -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);