From owner-cvs-all@FreeBSD.ORG Sun Oct 9 19:45:05 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 B659B16A420; Sun, 9 Oct 2005 19:45:05 +0000 (GMT) (envelope-from tegge@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F20D943D55; Sun, 9 Oct 2005 19:45:01 +0000 (GMT) (envelope-from tegge@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 j99Jj1Cm024438; Sun, 9 Oct 2005 19:45:01 GMT (envelope-from tegge@repoman.freebsd.org) Received: (from tegge@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j99Jj1kg024437; Sun, 9 Oct 2005 19:45:01 GMT (envelope-from tegge) Message-Id: <200510091945.j99Jj1kg024437@repoman.freebsd.org> From: Tor Egge Date: Sun, 9 Oct 2005 19:45:01 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/ufs/ffs ffs_snapshot.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: Sun, 09 Oct 2005 19:45:06 -0000 tegge 2005-10-09 19:45:01 UTC FreeBSD src repository Modified files: sys/ufs/ffs ffs_snapshot.c Log: Reduce the probability of low block numbers passed to ffs_snapblkfree() by skipping the call from ffs_snapremove() if the block number is zero. Simplify snapshot locking in ffs_copyonwrite() and ffs_snapblkfree() by using the same locking protocol for low block numbers as for larger block numbers. This removes a lock leak that could happen if vn_lock() succeeded after lockmgr() failed in ffs_snapblkfree(). Check if snapshot is gone before retrying a lock in ffs_copyonwrite(). Revision Changes Path 1.107 +35 -55 src/sys/ufs/ffs/ffs_snapshot.c