svn commit: r185071 - head/sys/fs/cd9660

[John Baldwin]

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 <fs/cd9660/cd9660_node.h>
 
 /*
- * 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++;