From owner-svn-src-head@freebsd.org Wed Dec 27 22:18:58 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 24ED1E815E4; Wed, 27 Dec 2017 22:18:58 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F09217AF13; Wed, 27 Dec 2017 22:18:57 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBRMIvKi038082; Wed, 27 Dec 2017 22:18:57 GMT (envelope-from mckusick@FreeBSD.org) Received: (from mckusick@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBRMIuKi038078; Wed, 27 Dec 2017 22:18:56 GMT (envelope-from mckusick@FreeBSD.org) Message-Id: <201712272218.vBRMIuKi038078@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mckusick set sender to mckusick@FreeBSD.org using -f From: Kirk McKusick Date: Wed, 27 Dec 2017 22:18:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327253 - head/sbin/dump X-SVN-Group: head X-SVN-Commit-Author: mckusick X-SVN-Commit-Paths: head/sbin/dump X-SVN-Commit-Revision: 327253 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Dec 2017 22:18:58 -0000 Author: mckusick Date: Wed Dec 27 22:18:56 2017 New Revision: 327253 URL: https://svnweb.freebsd.org/changeset/base/327253 Log: In preparation for converting to libufs to read the superblock, change conflicting function names: getino => getinode bread => blkread No functional change. Modified: head/sbin/dump/dump.h head/sbin/dump/main.c head/sbin/dump/tape.c head/sbin/dump/traverse.c Modified: head/sbin/dump/dump.h ============================================================================== --- head/sbin/dump/dump.h Wed Dec 27 22:01:30 2017 (r327252) +++ head/sbin/dump/dump.h Wed Dec 27 22:18:56 2017 (r327253) @@ -108,7 +108,7 @@ int mapfiles(ino_t maxino, long *tapesize); int mapdirs(ino_t maxino, long *tapesize); /* file dumping routines */ -void bread(ufs2_daddr_t blkno, char *buf, int size); +void blkread(ufs2_daddr_t blkno, char *buf, int size); ssize_t cread(int fd, void *buf, size_t nbytes, off_t offset); void dumpino(union dinode *dp, ino_t ino); void dumpmap(char *map, int type, ino_t ino); @@ -127,7 +127,7 @@ void dumpabort(int signo) __dead2; void dump_getfstab(void); char *rawname(char *cp); -union dinode *getino(ino_t inum, int *mode); +union dinode *getinode(ino_t inum, int *mode); /* rdump routines */ #ifdef RDUMP Modified: head/sbin/dump/main.c ============================================================================== --- head/sbin/dump/main.c Wed Dec 27 22:01:30 2017 (r327252) +++ head/sbin/dump/main.c Wed Dec 27 22:18:56 2017 (r327253) @@ -439,8 +439,8 @@ main(int argc, char *argv[]) sync(); sblock = (struct fs *)sblock_buf; for (i = 0; sblock_try[i] != -1; i++) { - sblock->fs_fsize = SBLOCKSIZE; /* needed in bread */ - bread(sblock_try[i] >> dev_bshift, (char *) sblock, SBLOCKSIZE); + sblock->fs_fsize = SBLOCKSIZE; /* needed in blkread */ + blkread(sblock_try[i]>>dev_bshift, (char *) sblock, SBLOCKSIZE); if ((sblock->fs_magic == FS_UFS1_MAGIC || (sblock->fs_magic == FS_UFS2_MAGIC && sblock->fs_sblockloc == sblock_try[i])) && @@ -556,7 +556,7 @@ main(int argc, char *argv[]) /* * Skip directory inodes deleted and maybe reallocated */ - dp = getino(ino, &mode); + dp = getinode(ino, &mode); if (mode != IFDIR) continue; (void)dumpino(dp, ino); @@ -575,7 +575,7 @@ main(int argc, char *argv[]) /* * Skip inodes deleted and reallocated as directories. */ - dp = getino(ino, &mode); + dp = getinode(ino, &mode); if (mode == IFDIR) continue; (void)dumpino(dp, ino); Modified: head/sbin/dump/tape.c ============================================================================== --- head/sbin/dump/tape.c Wed Dec 27 22:01:30 2017 (r327252) +++ head/sbin/dump/tape.c Wed Dec 27 22:18:56 2017 (r327253) @@ -786,7 +786,7 @@ doslave(int cmd, int slave_number) for (trecno = 0; trecno < ntrec; trecno += p->count, p += p->count) { if (p->dblk) { - bread(p->dblk, slp->tblock[trecno], + blkread(p->dblk, slp->tblock[trecno], p->count * TP_BSIZE); } else { if (p->count != 1 || atomic(read, cmd, Modified: head/sbin/dump/traverse.c ============================================================================== --- head/sbin/dump/traverse.c Wed Dec 27 22:01:30 2017 (r327252) +++ head/sbin/dump/traverse.c Wed Dec 27 22:18:56 2017 (r327253) @@ -162,7 +162,7 @@ mapfiles(ino_t maxino, long *tapesize) quit("mapfiles: cannot allocate memory.\n"); for (cg = 0; cg < sblock->fs_ncg; cg++) { ino = cg * sblock->fs_ipg; - bread(fsbtodb(sblock, cgtod(sblock, cg)), (char *)cgp, + blkread(fsbtodb(sblock, cgtod(sblock, cg)), (char *)cgp, sblock->fs_cgsize); if (sblock->fs_magic == FS_UFS2_MAGIC) inosused = cgp->cg_initediblk; @@ -194,7 +194,7 @@ mapfiles(ino_t maxino, long *tapesize) } for (i = 0; i < inosused; i++, ino++) { if (ino < UFS_ROOTINO || - (dp = getino(ino, &mode)) == NULL || + (dp = getinode(ino, &mode)) == NULL || (mode & IFMT) == 0) continue; if (ino >= maxino) { @@ -276,7 +276,7 @@ mapdirs(ino_t maxino, long *tapesize) nodump = !nonodump && (TSTINO(ino, usedinomap) == 0); if ((isdir & 1) == 0 || (TSTINO(ino, dumpinomap) && !nodump)) continue; - dp = getino(ino, &i); + dp = getinode(ino, &i); /* * inode buf may change in searchdir(). */ @@ -342,7 +342,7 @@ dirindir( int ret = 0; int i; - bread(fsbtodb(sblock, blkno), (char *)&idblk, (int)sblock->fs_bsize); + blkread(fsbtodb(sblock, blkno), (char *)&idblk, (int)sblock->fs_bsize); if (ind_level <= 0) { for (i = 0; *filesize > 0 && i < NINDIR(sblock); i++) { if (sblock->fs_magic == FS_UFS1_MAGIC) @@ -395,7 +395,7 @@ searchdir( if (dblk == NULL && (dblk = malloc(sblock->fs_bsize)) == NULL) quit("searchdir: cannot allocate indirect memory.\n"); - bread(fsbtodb(sblock, blkno), dblk, (int)size); + blkread(fsbtodb(sblock, blkno), dblk, (int)size); if (filesize < size) size = filesize; for (loc = 0; loc < size; ) { @@ -420,7 +420,7 @@ searchdir( continue; } if (nodump) { - ip = getino(dp->d_ino, &mode); + ip = getinode(dp->d_ino, &mode); if (TSTINO(dp->d_ino, dumpinomap)) { CLRINO(dp->d_ino, dumpinomap); *tapesize -= blockest(ip); @@ -591,7 +591,7 @@ dmpindir(union dinode *dp, ino_t ino, ufs2_daddr_t blk int i, cnt, last; if (blk != 0) - bread(fsbtodb(sblock, blk), (char *)&idblk, + blkread(fsbtodb(sblock, blk), (char *)&idblk, (int)sblock->fs_bsize); else memset(&idblk, 0, sblock->fs_bsize); @@ -871,7 +871,7 @@ writeheader(ino_t ino) } union dinode * -getino(ino_t inum, int *modep) +getinode(ino_t inum, int *modep) { static ino_t minino, maxino; static caddr_t inoblock; @@ -883,7 +883,7 @@ getino(ino_t inum, int *modep) curino = inum; if (inum >= minino && inum < maxino) goto gotit; - bread(fsbtodb(sblock, ino_to_fsba(sblock, inum)), inoblock, + blkread(fsbtodb(sblock, ino_to_fsba(sblock, inum)), inoblock, (int)sblock->fs_bsize); minino = inum - (inum % INOPB(sblock)); maxino = minino + INOPB(sblock); @@ -908,7 +908,7 @@ int breaderrors = 0; #define BREADEMAX 32 void -bread(ufs2_daddr_t blkno, char *buf, int size) +blkread(ufs2_daddr_t blkno, char *buf, int size) { int secsize, bytes, resid, xfer, base, cnt, i; static char *tmpbuf;