From owner-svn-soc-all@FreeBSD.ORG  Thu Jul  5 10:23:47 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 13073106566C
	for <svn-soc-all@FreeBSD.org>; Thu,  5 Jul 2012 10:23:45 +0000 (UTC)
	(envelope-from oleksandr@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Thu, 05 Jul 2012 10:23:45 +0000
Date: Thu, 05 Jul 2012 10:23:45 +0000
From: oleksandr@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120705102345.13073106566C@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r238992 - soc2012/oleksandr/udf-head/sys/fs/udf2
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jul 2012 10:23:47 -0000

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";