From owner-freebsd-stable@FreeBSD.ORG Sat Jan 23 21:25:37 2010 Return-Path: Delivered-To: stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDD6B1065672 for ; Sat, 23 Jan 2010 21:25:37 +0000 (UTC) (envelope-from imb@protected-networks.net) Received: from sarah.protected-networks.net (sarah.protected-networks.net [IPv6:2001:470:1f07:4e1::1]) by mx1.freebsd.org (Postfix) with ESMTP id 901258FC12 for ; Sat, 23 Jan 2010 21:25:37 +0000 (UTC) Received: from toshi.auburn.protected-networks.net (toshi.auburn.protected-networks.net [202.12.127.84]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "Iain Butler", Issuer "RSA Class 2 Personal CA" (verified OK)) (Authenticated sender: imb) by sarah.protected-networks.net (Postfix) with ESMTPSA id B8FBF612E for ; Sat, 23 Jan 2010 16:25:36 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=protected-networks.net; s=200705; t=1264281936; bh=2k3ouCgM5KeXL5l7Hm9ix+RT4W6W8XHlyAHpke9qkOE=; h=Message-ID:Date:From:MIME-Version:To:Subject:References: In-Reply-To:Content-Type:Content-Transfer-Encoding; b=QgSboAiXxqMRCG5peuKk/aMPRPc67ZB9pjtG2ErUPanMH8ZYi6WO+Vc2Ru1As/+cC jYGWhVLYvHwFejzI4cH+qzdRDz7hnfy4uakGQ59HAGu8FnBd5z1SFruToIFJU6l DomainKey-Signature: a=rsa-sha1; s=200509; d=protected-networks.net; c=nofws; q=dns; h=message-id:date:from:user-agent:mime-version:to:subject: references:in-reply-to:x-enigmail-version:openpgp:content-type:content-transfer-encoding; b=RCoAUqXBogAU75jjND+fDUDJyESj0h9L5eqWRKiJCZg+d7OkV6hriWZV1+rBObGA0 skX+02n7BSef1cOlRlvehiEfOdUGVvbAh2Dozdj0XsKKZQO/MgaRj4jergt9Joi Message-ID: <4B5B694F.8050708@protected-networks.net> Date: Sat, 23 Jan 2010 16:25:35 -0500 From: Michael Butler User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.7) Gecko/20100121 Thunderbird/3.0.1 MIME-Version: 1.0 To: stable@freebsd.org References: <4B5B686E.6090500@protected-networks.net> In-Reply-To: <4B5B686E.6090500@protected-networks.net> X-Enigmail-Version: 1.0 OpenPGP: id=0442D492 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Subject: Re: RELENG_7: SVN rev 202895 fails to compile X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Jan 2010 21:25:37 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 01/23/10 16:21, Michael Butler wrote: > The attached patch corrects the number of arguments given to > vfs_unbusy() as introduced by SVN rev 202895 on the assumption that the > idea was to migrate from vfs_rel() to vfs_unbusy() in those instances, > > imb Ugh .. I hate it when that happens :-( *** src/sys/kern/vfs_syscalls.c.orig Sat Jan 23 16:13:07 2010 - --- src/sys/kern/vfs_syscalls.c Sat Jan 23 16:13:39 2010 *************** *** 337,343 **** } *buf = *sp; out: ! vfs_unbusy(mp); VFS_UNLOCK_GIANT(vfslocked); if (mtx_owned(&Giant)) printf("statfs(%d): %s: %d\n", vfslocked, path, error); - --- 337,343 ---- } *buf = *sp; out: ! vfs_unbusy(mp, td); VFS_UNLOCK_GIANT(vfslocked); if (mtx_owned(&Giant)) printf("statfs(%d): %s: %d\n", vfslocked, path, error); *************** *** 429,435 **** *buf = *sp; out: if (mp) ! vfs_unbusy(mp); VFS_UNLOCK_GIANT(vfslocked); return (error); } - --- 429,435 ---- *buf = *sp; out: if (mp) ! vfs_unbusy(mp, td); VFS_UNLOCK_GIANT(vfslocked); return (error); } -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (FreeBSD) iEYEARECAAYFAktbaU4ACgkQQv9rrgRC1JJFNACfT1cQo6RUiC6qWc5CfkyTDMhW nQgAn0TZwJxIR7Ijpt39yaAV+KH/+GFN =Fagv -----END PGP SIGNATURE-----