socsvn commit: r238992 - soc2012/oleksandr/udf-head/sys/fs/udf2

[oleksandr at FreeBSD.org]

Author: oleksandr
Date: Thu Jul  5 10:23:44 2012
New Revision: 238992
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238992

Log:
  clean strange code

Modified:
  soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vfsops.c

Modified: soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vfsops.c
==============================================================================
--- soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vfsops.c	Thu Jul  5 10:21:01 2012	(r238991)
+++ soc2012/oleksandr/udf-head/sys/fs/udf2/udf_vfsops.c	Thu Jul  5 10:23:44 2012	(r238992)
@@ -353,6 +353,8 @@
 	if ((error = vflush(ump->vfs_mountp, 0, flags, curthread)))
 		return (error);
 
+	DPRINTF(VOLUMES, ("flush OK on unmount\n"));
+
 	/* close logical volume and close session if requested */
 	if ((error = udf_close_logvol(ump, mntflags)) != 0)
 		return (error);
@@ -378,10 +380,6 @@
 /* TODO: clean up iconv here */
 	if (ump->iconv_d2l)
 		udf2_iconv->close(ump->iconv_d2l);
-#if 0
-	if (ump->iconv_d2l)
-		udf2_iconv->close(ump->iconv_d2l);
-#endif
 
 	DROP_GIANT();
 	g_topology_lock();
@@ -496,11 +494,7 @@
 	}
 
 	/* set up arguments and device */
-	ump->mount_args = *(struct udf_argRNO) == 0)
-		(kgdb)
-		140                             td->td_errno = error;
-	(kgdb)
-		148                     if (systrace_probe_func !=:
+	ump->mount_args = *(struct udf_args *)optdata;
 
 	if (ump->flags & UDFMNT_KICONV && udf2_iconv) {
 		cs_disk = "UTF-16BE";