From owner-svn-src-all@FreeBSD.ORG Mon Jun 13 19:40:09 2011 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 79E30106564A; Mon, 13 Jun 2011 19:40:09 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 691F68FC13; Mon, 13 Jun 2011 19:40:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5DJe9RS095886; Mon, 13 Jun 2011 19:40:09 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5DJe93A095884; Mon, 13 Jun 2011 19:40:09 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201106131940.p5DJe93A095884@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 13 Jun 2011 19:40:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223055 - stable/8/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: Mon, 13 Jun 2011 19:40:09 -0000 Author: kib Date: Mon Jun 13 19:40:09 2011 New Revision: 223055 URL: http://svn.freebsd.org/changeset/base/223055 Log: Cherry-pick a single bit from r222958. Do not pass '3' as the sleepflag to bufobj_wwait() in the ffs_syncvnode(). It only mangles the priority argument of msleep(). Discussed with: jeff Modified: stable/8/sys/ufs/ffs/ffs_vnops.c Modified: stable/8/sys/ufs/ffs/ffs_vnops.c ============================================================================== --- stable/8/sys/ufs/ffs/ffs_vnops.c Mon Jun 13 19:33:13 2011 (r223054) +++ stable/8/sys/ufs/ffs/ffs_vnops.c Mon Jun 13 19:40:09 2011 (r223055) @@ -322,7 +322,7 @@ loop: } if (wait) { - bufobj_wwait(bo, 3, 0); + bufobj_wwait(bo, 0, 0); BO_UNLOCK(bo); /*