From owner-svn-src-all@FreeBSD.ORG Sat Nov 27 20:27:08 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41AD0106566C; Sat, 27 Nov 2010 20:27:08 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 310B38FC15; Sat, 27 Nov 2010 20:27:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oARKR8TC095144; Sat, 27 Nov 2010 20:27:08 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oARKR85u095142; Sat, 27 Nov 2010 20:27:08 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201011272027.oARKR85u095142@svn.freebsd.org> From: Peter Holm Date: Sat, 27 Nov 2010 20:27:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215950 - head/sys/ufs/ffs X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Nov 2010 20:27:08 -0000 Author: pho Date: Sat Nov 27 20:27:07 2010 New Revision: 215950 URL: http://svn.freebsd.org/changeset/base/215950 Log: First step in fixing the handle_workitem_freeblocks panic. In collaboration with: kib Modified: head/sys/ufs/ffs/ffs_softdep.c Modified: head/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- head/sys/ufs/ffs/ffs_softdep.c Sat Nov 27 19:47:58 2010 (r215949) +++ head/sys/ufs/ffs/ffs_softdep.c Sat Nov 27 20:27:07 2010 (r215950) @@ -6024,11 +6024,12 @@ handle_complete_freeblocks(freeblks) vput(vp); } - KASSERT(freeblks->fb_chkcnt == 0 || - ((fs->fs_flags & FS_UNCLEAN) != 0 && (flags & LK_NOWAIT) == 0), - ("handle_workitem_freeblocks: inode %ju block count %jd\n", - (uintmax_t)freeblks->fb_previousinum, - (intmax_t)freeblks->fb_chkcnt)); + if (!(freeblks->fb_chkcnt == 0 || + ((fs->fs_flags & FS_UNCLEAN) != 0 && (flags & LK_NOWAIT) == 0))) + printf( + "handle_workitem_freeblocks: inode %ju block count %jd\n", + (uintmax_t)freeblks->fb_previousinum, + (intmax_t)freeblks->fb_chkcnt); ACQUIRE_LOCK(&lk); /*