From owner-svn-src-all@FreeBSD.ORG Tue Nov 18 23:19:44 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 54B2C106564A; Tue, 18 Nov 2008 23:19:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 400028FC24; Tue, 18 Nov 2008 23:19:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAINJiVT096142; Tue, 18 Nov 2008 23:19:44 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAINJhdo096139; Tue, 18 Nov 2008 23:19:43 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200811182319.mAINJhdo096139@svn.freebsd.org> From: John Baldwin Date: Tue, 18 Nov 2008 23:19:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185071 - head/sys/fs/cd9660 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Tue, 18 Nov 2008 23:19:44 -0000 Author: jhb Date: Tue Nov 18 23:19:43 2008 New Revision: 185071 URL: http://svn.freebsd.org/changeset/base/185071 Log: - Fix a typo in a comment. - Whitespace fix. - Remove #if 0'd BSD 4.x code for flushing busy buffers from a mountpoint during an unmount. FreeBSD uses vflush() for this. Modified: head/sys/fs/cd9660/cd9660_bmap.c head/sys/fs/cd9660/cd9660_vfsops.c head/sys/fs/cd9660/cd9660_vnops.c Modified: head/sys/fs/cd9660/cd9660_bmap.c ============================================================================== --- head/sys/fs/cd9660/cd9660_bmap.c Tue Nov 18 23:18:37 2008 (r185070) +++ head/sys/fs/cd9660/cd9660_bmap.c Tue Nov 18 23:19:43 2008 (r185071) @@ -46,9 +46,10 @@ __FBSDID("$FreeBSD$"); #include /* - * Bmap converts a the logical block number of a file to its physical block - * number on the disk. The conversion is done by using the logical block - * number to index into the data block (extent) for the file. + * Bmap converts the logical block number of a file to its physical + * block number on the disk. The conversion is done by using the + * logical block number to index into the data block (extent) for the + * file. */ int cd9660_bmap(ap) Modified: head/sys/fs/cd9660/cd9660_vfsops.c ============================================================================== --- head/sys/fs/cd9660/cd9660_vfsops.c Tue Nov 18 23:18:37 2008 (r185070) +++ head/sys/fs/cd9660/cd9660_vfsops.c Tue Nov 18 23:19:43 2008 (r185071) @@ -501,11 +501,6 @@ cd9660_unmount(mp, mntflags, td) if (mntflags & MNT_FORCE) flags |= FORCECLOSE; -#if 0 - mntflushbuf(mp, 0); - if (mntinvalbuf(mp)) - return EBUSY; -#endif if ((error = vflush(mp, 0, flags, td))) return (error); Modified: head/sys/fs/cd9660/cd9660_vnops.c ============================================================================== --- head/sys/fs/cd9660/cd9660_vnops.c Tue Nov 18 23:18:37 2008 (r185070) +++ head/sys/fs/cd9660/cd9660_vnops.c Tue Nov 18 23:19:43 2008 (r185071) @@ -396,7 +396,7 @@ iso_shipdir(idp) cl = idp->current.d_namlen; cname = idp->current.d_name; -assoc = (cl > 1) && (*cname == ASSOCCHAR); + assoc = (cl > 1) && (*cname == ASSOCCHAR); if (assoc) { cl--; cname++;