From owner-p4-projects@FreeBSD.ORG Mon Jul 24 18:22:39 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 9FBB316A4EC; Mon, 24 Jul 2006 18:22:39 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id 4CBD716A4DE
for <perforce@freebsd.org>; Mon, 24 Jul 2006 18:22:39 +0000 (UTC)
(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id 1D43843D58
for <perforce@freebsd.org>; Mon, 24 Jul 2006 18:22:39 +0000 (GMT)
(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6OIMcer022543
for <perforce@freebsd.org>; Mon, 24 Jul 2006 18:22:38 GMT
(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OIMcXG022540
for perforce@freebsd.org; Mon, 24 Jul 2006 18:22:38 GMT
(envelope-from jhb@freebsd.org)
Date: Mon, 24 Jul 2006 18:22:38 GMT
Message-Id: <200607241822.k6OIMcXG022540@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 102304 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Jul 2006 18:22:39 -0000
http://perforce.freebsd.org/chv.cgi?CH=102304
Change 102304 by jhb@jhb_mutex on 2006/07/24 18:21:46
Hold the reference on the mountpoint longer since
prison_enforce_statfs() likes to fondle the mountpoint.
Affected files ...
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#113 edit
Differences ...
==== //depot/projects/smpng/sys/kern/vfs_syscalls.c#113 (text+ko) ====
@@ -266,7 +266,6 @@
sp->f_namemax = NAME_MAX;
sp->f_flags = mp->mnt_flag & MNT_VISFLAGMASK;
error = VFS_STATFS(mp, sp, td);
- vfs_rel(mp);
if (error)
goto out;
if (suser(td)) {
@@ -277,6 +276,7 @@
}
*buf = *sp;
out:
+ vfs_rel(mp);
VFS_UNLOCK_GIANT(vfslocked);
if (mtx_owned(&Giant))
printf("statfs(%d): %s: %d\n", vfslocked, path, error);
@@ -355,7 +355,6 @@
sp->f_namemax = NAME_MAX;
sp->f_flags = mp->mnt_flag & MNT_VISFLAGMASK;
error = VFS_STATFS(mp, sp, td);
- vfs_rel(mp);
if (error)
goto out;
if (suser(td)) {
@@ -366,6 +365,7 @@
}
*buf = *sp;
out:
+ vfs_rel(mp);
VFS_UNLOCK_GIANT(vfslocked);
return (error);
}