From owner-svn-src-user@FreeBSD.ORG Mon May 25 03:41:40 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C93381065676; Mon, 25 May 2009 03:41:40 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B824A8FC22; Mon, 25 May 2009 03:41:40 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4P3fepi009654; Mon, 25 May 2009 03:41:40 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4P3feQA009653; Mon, 25 May 2009 03:41:40 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200905250341.n4P3feQA009653@svn.freebsd.org> From: Kip Macy Date: Mon, 25 May 2009 03:41:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192717 - user/kmacy/releng_7_2_fcs/sys/kern X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2009 03:41:41 -0000 Author: kmacy Date: Mon May 25 03:41:40 2009 New Revision: 192717 URL: http://svn.freebsd.org/changeset/base/192717 Log: eliminate one point of contention for the mnt lock by making mnt_opwritecount atomically updated Modified: user/kmacy/releng_7_2_fcs/sys/kern/vfs_vnops.c Modified: user/kmacy/releng_7_2_fcs/sys/kern/vfs_vnops.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/kern/vfs_vnops.c Mon May 25 03:24:47 2009 (r192716) +++ user/kmacy/releng_7_2_fcs/sys/kern/vfs_vnops.c Mon May 25 03:41:40 2009 (r192717) @@ -929,7 +929,7 @@ vn_start_write(vp, mpp, flags) } if (flags & V_XSLEEP) goto unlock; - mp->mnt_writeopcount++; + atomic_add_int(&mp->mnt_writeopcount, 1); unlock: MNT_REL(mp); MNT_IUNLOCK(mp); @@ -999,19 +999,23 @@ vn_start_secondary_write(vp, mpp, flags) * now in effect. */ void -vn_finished_write(mp) - struct mount *mp; +vn_finished_write(struct mount *mp) { + int writeopcount; + if (mp == NULL) return; - MNT_ILOCK(mp); - mp->mnt_writeopcount--; - if (mp->mnt_writeopcount < 0) + + writeopcount = atomic_fetchadd_int(&mp->mnt_writeopcount, -1) - 1; + + if (writeopcount < 0) panic("vn_finished_write: neg cnt"); if ((mp->mnt_kern_flag & MNTK_SUSPEND) != 0 && - mp->mnt_writeopcount <= 0) + writeopcount <= 0) { + MNT_ILOCK(mp); wakeup(&mp->mnt_writeopcount); - MNT_IUNLOCK(mp); + MNT_IUNLOCK(mp); + } }