From owner-svn-src-all@freebsd.org Mon Mar 27 20:24:19 2017 Return-Path: Delivered-To: svn-src-all@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 F1C09D208BF; Mon, 27 Mar 2017 20:24:19 +0000 (UTC) (envelope-from emaste@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 BED546E4; Mon, 27 Mar 2017 20:24:19 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2RKOI69070765; Mon, 27 Mar 2017 20:24:18 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2RKOIE7070764; Mon, 27 Mar 2017 20:24:18 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201703272024.v2RKOIE7070764@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 27 Mar 2017 20:24:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r316055 - head/usr.sbin/makefs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Mar 2017 20:24:20 -0000 Author: emaste Date: Mon Mar 27 20:24:18 2017 New Revision: 316055 URL: https://svnweb.freebsd.org/changeset/base/316055 Log: makefs: sort roundup with the other off_t members in fsinfo_t MFC after: 1 week Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/makefs/makefs.h Modified: head/usr.sbin/makefs/makefs.h ============================================================================== --- head/usr.sbin/makefs/makefs.h Mon Mar 27 19:26:09 2017 (r316054) +++ head/usr.sbin/makefs/makefs.h Mon Mar 27 20:24:18 2017 (r316055) @@ -151,12 +151,12 @@ typedef struct makefs_fsinfo { off_t maxsize; /* maximum size image can be */ off_t freefiles; /* free file entries to leave */ off_t freeblocks; /* free blocks to leave */ + off_t roundup; /* round image size up to this value */ int freefilepc; /* free file % */ int freeblockpc; /* free block % */ int needswap; /* non-zero if byte swapping needed */ int sectorsize; /* sector size */ int sparse; /* sparse image, don't fill it with zeros */ - off_t roundup; /* round image size up to this value */ void *fs_specific; /* File system specific additions. */ option_t *fs_options; /* File system specific options */