From owner-cvs-src-old@FreeBSD.ORG Sat Apr 23 11:22:59 2011 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF2DF106564A for ; Sat, 23 Apr 2011 11:22:59 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C65DD8FC08 for ; Sat, 23 Apr 2011 11:22:59 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p3NBMxUC098054 for ; Sat, 23 Apr 2011 11:22:59 GMT (envelope-from rmacklem@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p3NBMxt4098051 for cvs-src-old@freebsd.org; Sat, 23 Apr 2011 11:22:59 GMT (envelope-from rmacklem@repoman.freebsd.org) Message-Id: <201104231122.p3NBMxt4098051@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rmacklem@repoman.freebsd.org using -f From: Rick Macklem Date: Sat, 23 Apr 2011 11:22:48 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/kern vfs_subr.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2011 11:23:00 -0000 rmacklem 2011-04-23 11:22:48 UTC FreeBSD src repository Modified files: sys/kern vfs_subr.c Log: SVN rev 220967 on 2011-04-23 11:22:48Z by rmacklem Fix a LOR in vfs_busy() where, after msleeping, it would lock the mutexes in the wrong order for the case where the MBF_MNTLSTLOCK is set. I believe this did have the potential for deadlock. For example, if multiple nfsd threads called vfs_busyfs(), which calls vfs_busy() with MBF_MNTLSTLOCK. Thanks go to pho for catching this during his testing. Tested by: pho Submitted by: kib MFC after: 2 weeks Revision Changes Path 1.808 +2 -1 src/sys/kern/vfs_subr.c