From owner-cvs-all@FreeBSD.ORG Wed Nov 16 08:12:11 2005 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C073F16A41F; Wed, 16 Nov 2005 08:12:11 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9696243D49; Wed, 16 Nov 2005 08:12:11 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jAG8CBbI046698; Wed, 16 Nov 2005 08:12:11 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAG8CBpA046697; Wed, 16 Nov 2005 08:12:11 GMT (envelope-from rwatson) Message-Id: <200511160812.jAG8CBpA046697@repoman.freebsd.org> From: Robert Watson Date: Wed, 16 Nov 2005 08:12:11 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/kern kern_descrip.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Nov 2005 08:12:11 -0000 rwatson 2005-11-16 08:12:11 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/kern kern_descrip.c Log: Merge kern_descrip.c:1.284 from HEAD to RELENG_6: In closef(), remove the assumption that there is a thread associated with the file descriptor. When a file descriptor is closed as a result of garbage collecting a UNIX domain socket, the file descriptor will not have any associated thread, so the logic to identify advisory locks held by that thread is not appropriate. Check the thread for NULL to avoid this scenario. Expand an existing comment to say a bit more about this. Revision Changes Path 1.279.2.4 +6 -2 src/sys/kern/kern_descrip.c