From owner-svn-src-head@FreeBSD.ORG Mon May 13 18:34:33 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BD9905DE; Mon, 13 May 2013 18:34:33 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AF3A9101; Mon, 13 May 2013 18:34:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4DIYX7I035167; Mon, 13 May 2013 18:34:33 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4DIYXH7035166; Mon, 13 May 2013 18:34:33 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201305131834.r4DIYXH7035166@svn.freebsd.org> From: Marcel Moolenaar Date: Mon, 13 May 2013 18:34:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250605 - 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-head@freebsd.org X-Mailman-Version: 2.1.14 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, 13 May 2013 18:34:33 -0000 Author: marcel Date: Mon May 13 18:34:33 2013 New Revision: 250605 URL: http://svnweb.freebsd.org/changeset/base/250605 Log: Set st_nlink in the stat structure within the inode to 1 as well. The cd9660 file system uses that field for the link count and it was 0. This impacts pwd_mkdb(8) as it checks for st_nlink not being 0 as part of closing a race. Modified: head/usr.sbin/makefs/mtree.c Modified: head/usr.sbin/makefs/mtree.c ============================================================================== --- head/usr.sbin/makefs/mtree.c Mon May 13 18:13:50 2013 (r250604) +++ head/usr.sbin/makefs/mtree.c Mon May 13 18:34:33 2013 (r250605) @@ -1050,6 +1050,7 @@ read_mtree(const char *fname, fsnode *no bzero(&mtree_global_inode, sizeof(mtree_global_inode)); mtree_global.inode = &mtree_global_inode; mtree_global_inode.nlink = 1; + mtree_global_inode.st.st_nlink = 1; mtree_global_inode.st.st_atime = mtree_global_inode.st.st_ctime = mtree_global_inode.st.st_mtime = time(NULL); errors = warnings = 0;