Date: Wed, 20 Mar 2002 19:23:48 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 8115 for review Message-ID: <200203210323.g2L3NmR78074@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8115 Change 8115 by peter@peter_daintree on 2002/03/20 19:23:30 revert to vendor (get rid of my debug printfs and hacks) Affected files ... ... //depot/projects/ia64/sys/kern/vfs_conf.c#5 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#8 integrate Differences ... ==== //depot/projects/ia64/sys/kern/vfs_conf.c#5 (text+ko) ==== @@ -198,12 +198,8 @@ path = malloc(MNAMELEN, M_MOUNT, M_WAITOK); vfsname[0] = path[0] = 0; sprintf(patt, "%%%d[a-z0-9]:%%%ds", MFSNAMELEN, MNAMELEN); - if ((s = sscanf(mountfrom, patt, vfsname, path)) < 1) { - printf("sscanf failed (%d). mountfrom=%s, patt=%s, vfsname=%s, path=%s\n", s, mountfrom, patt, vfsname, path); - strcpy(vfsname, "ufs"); - strcpy(path, "da1s2a"); - } - printf("mountfrom=%s, patt=%s, vfsname=%s, path=%s\n", mountfrom, patt, vfsname, path); + if (sscanf(mountfrom, patt, vfsname, path) < 1) + goto done; /* allocate a root mount */ error = vfs_rootmountalloc(vfsname, path[0] != 0 ? path : ROOTNAME, @@ -233,7 +229,6 @@ strncpy(mp->mnt_stat.f_mntonname, "/", MNAMELEN); error = VFS_MOUNT(mp, NULL, NULL, NULL, curthread); - printf("VFS_MOUNT: returns %d\n", error); done: if (vfsname != NULL) ==== //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#8 (text+ko) ==== @@ -156,11 +156,8 @@ return (error); } - if ((error = ffs_mountfs(rootvp, mp, td, M_FFSNODE)) != 0) { - printf("ffs_mountfs returns %d\n", error); + if ((error = ffs_mountfs(rootvp, mp, td, M_FFSNODE)) != 0) return (error); - } - (void)VFS_STATFS(mp, &mp->mnt_stat, td); return (0); } @@ -566,10 +563,8 @@ * Flush out any old buffers remaining from a previous use. */ error = vfs_mountedon(devvp); - if (error) { - printf("mountedon\n"); + if (error) return (error); - } ncount = vcount(devvp); if (ncount > 1 && devvp != rootvp) @@ -606,7 +601,6 @@ error = VOP_OPEN(devvp, FREAD|FWRITE, FSCRED, td); #endif VOP_UNLOCK(devvp, 0, td); - printf("VOP_OPEN: %d\n", error); if (error) return (error); if (devvp->v_rdev->si_iosize_max > mp->mnt_iosize_max) @@ -621,17 +615,11 @@ bp = NULL; ump = NULL; - if ((error = bread(devvp, SBLOCK, SBSIZE, cred, &bp)) != 0) { - printf("bread %d\n", error); + if ((error = bread(devvp, SBLOCK, SBSIZE, cred, &bp)) != 0) goto out; - } fs = (struct fs *)bp->b_data; if (fs->fs_magic != FS_MAGIC || fs->fs_bsize > MAXBSIZE || fs->fs_bsize < sizeof(struct fs)) { - printf("bad magic\n"); - printf("fs_magic: %x != %x\n", fs->fs_magic, FS_MAGIC); - printf("fs_bsize: %x > %x\n", fs->fs_bsize, MAXBSIZE); - printf("fs_bsize: %x < %x\n", fs->fs_bsize, sizeof(struct fs)); error = EINVAL; /* XXX needs translation */ goto out; } @@ -659,7 +647,6 @@ fs->fs_pendinginodes = 0; } } -printf("stage 1\n"); if (fs->fs_pendingblocks != 0 || fs->fs_pendinginodes != 0) { printf("%s: mount pending error: blocks %d files %d\n", fs->fs_fsmnt, fs->fs_pendingblocks, fs->fs_pendinginodes); @@ -786,7 +773,6 @@ fs->fs_clean = 0; (void) ffs_sbupdate(ump, MNT_WAIT); } - printf("almost done\n"); #ifdef UFS_EXTATTR #ifdef UFS_EXTATTR_AUTOSTART /* @@ -804,7 +790,6 @@ #endif /* !UFS_EXTATTR */ return (0); out: -printf("out: %d\n", error); devvp->v_rdev->si_mountpoint = NULL; if (bp) brelse(bp); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203210323.g2L3NmR78074>