 @@ -1,14 +1,14 @@
-/*      $NetBSD: procfs_linux.c,v 1.61 2011/09/04 17:32:10 jmcneill Exp $      */
+/*      $NetBSD: procfs_linux.c,v 1.62 2011/12/15 20:55:02 christos Exp $      */
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Frank van der Linden for Wasabi Systems, Inc.
+ *
  * 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
 @@ -26,44 +26,45 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.61 2011/09/04 17:32:10 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.62 2011/12/15 20:55:02 christos Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/exec.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/tty.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/conf.h>
 #include <sys/sysctl.h>
 #include <sys/kauth.h>
 #include <miscfs/procfs/procfs.h>
 #include <compat/linux/common/linux_exec.h>
 #include <compat/linux32/common/linux32_sysctl.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm.h>
 extern struct devsw_conv *devsw_conv;
 extern int max_devsw_convs;
 #define PGTOB(p)	((unsigned long)(p) << PAGE_SHIFT)
 @@ -554,56 +555,59 @@ procfs_douptime(struct lwp *curl, struct
 out:
 	free(bf, M_TEMP);
 	return error;
+}
 int
 procfs_domounts(struct lwp *curl, struct proc *p,
     struct pfsnode *pfs, struct uio *uio)
+{
 	char *bf, *mtab = NULL;
 	const char *fsname;
 	size_t len, mtabsz = 0;
 	struct mount *mp, *nmp;
-	struct statvfs *sfs;
+	struct statvfs sfs;
-	int error = 0;
+	int error = 0, suser;
 	suser = kauth_authorize_generic(curl->l_cred,
 	    KAUTH_GENERIC_ISSUSER, NULL) == 0;
 	bf = malloc(LBFSZ, M_TEMP, M_WAITOK);
 	mutex_enter(&mountlist_lock);
 	for (mp = CIRCLEQ_FIRST(&mountlist); mp != (void *)&mountlist;
 	     mp = nmp) {
-		if (vfs_busy(mp, &nmp)) {
+		if (vfs_busy(mp, &nmp))
 			continue;
-		sfs = &mp->mnt_stat;
+		if (dostatvfs(mp, &sfs, curl, MNT_WAIT, suser) != 0)
 			continue;
 		/* Linux uses different names for some filesystems */
-		fsname = sfs->f_fstypename;
+		fsname = sfs.f_fstypename;
 		if (strcmp(fsname, "procfs") == 0)
 			fsname = "proc";
 		else if (strcmp(fsname, "ext2fs") == 0)
 			fsname = "ext2";
 		len = snprintf(bf, LBFSZ, "%s %s %s %s%s%s%s%s%s 0 0\n",
-			sfs->f_mntfromname,
+			sfs.f_mntfromname,
-			sfs->f_mntonname,
+			sfs.f_mntonname,
 			fsname,
-			(mp->mnt_flag & MNT_RDONLY) ? "ro" : "rw",
+			(sfs.f_flag & ST_RDONLY) ? "ro" : "rw",
-			(mp->mnt_flag & MNT_NOSUID) ? ",nosuid" : "",
+			(sfs.f_flag & ST_NOSUID) ? ",nosuid" : "",
-			(mp->mnt_flag & MNT_NOEXEC) ? ",noexec" : "",
+			(sfs.f_flag & ST_NOEXEC) ? ",noexec" : "",
-			(mp->mnt_flag & MNT_NODEV) ? ",nodev" : "",
+			(sfs.f_flag & ST_NODEV) ? ",nodev" : "",
-			(mp->mnt_flag & MNT_SYNCHRONOUS) ? ",sync" : "",
+			(sfs.f_flag & ST_SYNCHRONOUS) ? ",sync" : "",
-			(mp->mnt_flag & MNT_NOATIME) ? ",noatime" : ""
+			(sfs.f_flag & ST_NOATIME) ? ",noatime" : ""
 			);
 		mtab = realloc(mtab, mtabsz + len, M_TEMP, M_WAITOK);
 		memcpy(mtab + mtabsz, bf, len);
 		mtabsz += len;
 		vfs_unbusy(mp, false, &nmp);
+	}
 	mutex_exit(&mountlist_lock);
 	free(bf, M_TEMP);
 	if (mtabsz > 0) {
 		error = uiomove_frombuf(mtab, mtabsz, uio);