Fri Jan 7 15:30:10 2011 UTC ()

in case unmount fails (it never should), do a full mountpoint dump


(pooka)

diff -r1.51 -r1.52 src/lib/libp2k/p2k.c

--- src/lib/libp2k/p2k.c 2011/01/07 11:15:30	1.51
+++ src/lib/libp2k/p2k.c 2011/01/07 15:30:09	1.52

 @@ -1,14 +1,14 @@
-/*	$NetBSD: p2k.c,v 1.51 2011/01/07 11:15:30 pooka Exp $	*/
+/*	$NetBSD: p2k.c,v 1.52 2011/01/07 15:30:09 pooka Exp $	*/
 /*
  * Copyright (c) 2007, 2008, 2009  Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Finnish Cultural Foundation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -544,26 +544,33 @@ p2k_fs_statvfs(struct puffs_usermount *p
 /*ARGSUSED*/
 int
 p2k_fs_unmount(struct puffs_usermount *pu, int flags)
+{
 	struct p2k_mount *p2m = puffs_getspecific(pu);
 	struct ukfs *fs = p2m->p2m_ukfs;
 	int error = 0;
 	rump_pub_vp_rele(p2m->p2m_rvp);
 	if (fs) {
 		if (ukfs_release(fs, 0) != 0) {
 			struct statvfs svfsb;
 			if (p2m->p2m_hasdebug
 			    && p2k_fs_statvfs(pu, &svfsb) == 0) {
 				printf("\nSOFT UNMOUNT FAILED, MP INFO DUMP\n");
 				rump_pub_vfs_mount_print(svfsb.f_mntonname, 1);
+			}
 			ukfs_release(fs, UKFS_RELFLAG_FORCE);
 			error = 0;
+		}
+	}
 	p2m->p2m_ukfs = NULL;
 	if (p2m->p2m_hasdebug) {
 		printf("-- rump kernel event counters --\n");
 		rump_printevcnts();
 		printf("-- end of event counters --\n");
+	}
 	return error;