From owner-svn-src-all@FreeBSD.ORG Fri Aug 27 14:10:25 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 905641065696; Fri, 27 Aug 2010 14:10:25 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 806878FC15; Fri, 27 Aug 2010 14:10:25 +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 o7REAPsD080269; Fri, 27 Aug 2010 14:10:25 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7REAP8T080267; Fri, 27 Aug 2010 14:10:25 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201008271410.o7REAP8T080267@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Fri, 27 Aug 2010 14:10:25 +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: r211880 - head/sbin/hastd 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: Fri, 27 Aug 2010 14:10:25 -0000 Author: pjd Date: Fri Aug 27 14:10:25 2010 New Revision: 211880 URL: http://svn.freebsd.org/changeset/base/211880 Log: Don't increase number synchronized bytes in case of an error. MFC after: 2 weeks Obtained from: Wheel Systems Sp. z o.o. http://www.wheelsystems.com Modified: head/sbin/hastd/primary.c Modified: head/sbin/hastd/primary.c ============================================================================== --- head/sbin/hastd/primary.c Fri Aug 27 14:08:10 2010 (r211879) +++ head/sbin/hastd/primary.c Fri Aug 27 14:10:25 2010 (r211880) @@ -1699,15 +1699,14 @@ sync_thread(void *arg __unused) strerror(hio->hio_errors[ncomp])); goto free_queue; } + + synced += length; free_queue: mtx_lock(&range_lock); rangelock_del(range_sync, offset, length); if (range_regular_wait) cv_signal(&range_regular_cond); mtx_unlock(&range_lock); - - synced += length; - pjdlog_debug(2, "sync: (%p) Moving request to the free queue.", hio); QUEUE_INSERT2(hio, free);