From owner-svn-src-head@freebsd.org Mon May 8 18:42:40 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 7E1B9D63110; Mon, 8 May 2017 18:42:40 +0000 (UTC) (envelope-from ngie@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 2EA5087C; Mon, 8 May 2017 18:42:40 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v48IgdWx081942; Mon, 8 May 2017 18:42:39 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v48IgdHp081940; Mon, 8 May 2017 18:42:39 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201705081842.v48IgdHp081940@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Mon, 8 May 2017 18:42:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r317967 - in head/usr.sbin/makefs: . ffs X-SVN-Group: head 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.23 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: Mon, 08 May 2017 18:42:40 -0000 Author: ngie Date: Mon May 8 18:42:38 2017 New Revision: 317967 URL: https://svnweb.freebsd.org/changeset/base/317967 Log: Restore `sectorsize` global to unbreak makefs after r317744 This also unbreaks the fstyp tests. Reported by: Alastair Hogge , Jenkins Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/makefs/ffs.c head/usr.sbin/makefs/ffs/buf.c Modified: head/usr.sbin/makefs/ffs.c ============================================================================== --- head/usr.sbin/makefs/ffs.c Mon May 8 18:30:56 2017 (r317966) +++ head/usr.sbin/makefs/ffs.c Mon May 8 18:42:38 2017 (r317967) @@ -143,7 +143,7 @@ static void *ffs_build_dinode2(struct u fsnode *, fsinfo_t *); - +int sectorsize; /* XXX: for buf.c::getblk() */ /* publicly visible functions */ void @@ -426,6 +426,8 @@ ffs_validate(const char *dir, fsnode *ro printf("ffs_validate: dir %s; %lld bytes, %lld inodes\n", dir, (long long)fsopts->size, (long long)fsopts->inodes); } + sectorsize = fsopts->sectorsize; /* XXX - see earlier */ + /* now check calculated sizes vs requested sizes */ if (fsopts->maxsize > 0 && fsopts->size > fsopts->maxsize) { errx(1, "`%s' size of %lld is larger than the maxsize of %lld.", Modified: head/usr.sbin/makefs/ffs/buf.c ============================================================================== --- head/usr.sbin/makefs/ffs/buf.c Mon May 8 18:30:56 2017 (r317966) +++ head/usr.sbin/makefs/ffs/buf.c Mon May 8 18:42:38 2017 (r317967) @@ -52,6 +52,8 @@ __FBSDID("$FreeBSD$"); #include "makefs.h" #include "buf.h" +extern int sectorsize; /* XXX: from ffs.c & mkfs.c */ + static TAILQ_HEAD(buftailhead,buf) buftail; int @@ -60,7 +62,6 @@ bread(struct vnode *vp, daddr_t blkno, i { off_t offset; ssize_t rv; - fsinfo_t *fs = vp->fs; assert (bpp != NULL); @@ -68,7 +69,7 @@ bread(struct vnode *vp, daddr_t blkno, i printf("%s: blkno %lld size %d\n", __func__, (long long)blkno, size); *bpp = getblk(vp, blkno, size, 0, 0, 0); - offset = (*bpp)->b_blkno * fs->sectorsize; + offset = (*bpp)->b_blkno * sectorsize; /* XXX */ if (debug & DEBUG_BUF_BREAD) printf("%s: blkno %lld offset %lld bcount %ld\n", __func__, (long long)(*bpp)->b_blkno, (long long) offset, @@ -125,10 +126,9 @@ bwrite(struct buf *bp) { off_t offset; ssize_t rv; - fsinfo_t *fs = bp->b_fs; assert (bp != NULL); - offset = bp->b_blkno * fs->sectorsize; + offset = bp->b_blkno * sectorsize; /* XXX */ if (debug & DEBUG_BUF_BWRITE) printf("bwrite: blkno %lld offset %lld bcount %ld\n", (long long)bp->b_blkno, (long long) offset,