From owner-svn-src-head@freebsd.org Fri May 31 03:14:55 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 10E9415B1669; Fri, 31 May 2019 03:14:55 +0000 (UTC) (envelope-from bjkfbsd@gmail.com) Received: from mail-ot1-x330.google.com (mail-ot1-x330.google.com [IPv6:2607:f8b0:4864:20::330]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 955EB807DD; Fri, 31 May 2019 03:14:54 +0000 (UTC) (envelope-from bjkfbsd@gmail.com) Received: by mail-ot1-x330.google.com with SMTP id k24so2647980otn.6; Thu, 30 May 2019 20:14:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=+WcQlD23NH7LAzVxJ6pPu1Hf/qGj38fxYTR+kAv+Px4=; b=g54z2Tzg3OUerSeUJV26IWgJ4fs6DplyBjTcan0ENGASsPiSsg1fm4Mt092cYXzyWl wCQmr5qRex9CYqVlx1RFUJA2u1gEHQY3Wn2Qrqx8AK1OgcCziITpHJlSEq5qJr54Wi33 iXTwGy7bJQRnb3hvQJHD1ibWc3FloxNa9zIaL+lgZhzs3rVhwf7rxsc7f8K/QVnYJoQ9 cUnfr4LQ/FXOsDwdd6+C/7UzUBb4t7Vou88h98SgNbqKWKQurIBG0P7adiRwZg/a7dV1 6Ib6GBkkovfHmJApVkxSa53uze3Z+ybnagTGppd65lmQDdXleGocoIsZBemODvBirmg5 exlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=+WcQlD23NH7LAzVxJ6pPu1Hf/qGj38fxYTR+kAv+Px4=; b=adnYQpl4DzhEIteM4LRMjubBf4WR6kYdIpR0DwrOe1ggSidiprGxw6XQX2mawdzKuh 22FRRFWBzc2Cvnh8+BeTIe3sU82687XM55FmhViRUsfaR2pV8AD64kpitKPiJDASvvw3 thTk+JQwHpIsnDVR2dyTTLc6NowsKn405M6kkjf9oDMEwHceVm8MBP1Hyig1/QGngSdl Okeawa9x/Dka6U5LNQid6SBITWI3poaN8fKMb5AdK6te18HpHCmJYzNhOeRQuyaIHBLE lZANye0D1fFDk/6qqWNWk9q/0fCup9K/dAUfv8YBY5mywnALvmYaJQf2lBtoGeCUk298 EnCQ== X-Gm-Message-State: APjAAAUhSiZakuz+MW1Kd6o9MTMGw5yp3e5opHse8HwRP2gxPiGZDnKh guzcK1X/A9fdwFvEy0O4+OQJrsPlW9CGXTBt4ZU4JgIn2PMIjZbX X-Google-Smtp-Source: APXvYqwMu3nGKFuv139P8mQwgT05ZHSIN8sIG1xiiediHlhZV8MVK714mAs3+wCF93CEqZ8PzFyLNAR39y3cz5mlb8c= X-Received: by 2002:a9d:3782:: with SMTP id x2mr36644otb.354.1559272493527; Thu, 30 May 2019 20:14:53 -0700 (PDT) MIME-Version: 1.0 References: <201905301504.x4UF49UT019928@repo.freebsd.org> In-Reply-To: <201905301504.x4UF49UT019928@repo.freebsd.org> From: Benjamin Kaduk Date: Thu, 30 May 2019 20:14:42 -0700 Message-ID: Subject: Re: svn commit: r348421 - head/sys/kern To: Konstantin Belousov Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 955EB807DD X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.92 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.92)[-0.923,0] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 May 2019 03:14:55 -0000 On Thu, May 30, 2019 at 8:04 AM Konstantin Belousov wrote: > Author: kib > Date: Thu May 30 15:04:09 2019 > New Revision: 348421 > URL: https://svnweb.freebsd.org/changeset/base/348421 > > Log: > Silence witness warning about duplicated mutex type. > > The order is correct, it is nullfs vnode interlock -> lower vnode > interlock. vop_stdadd_writecount() is called from nullfs > VOP_ADD_WRITECOUNT() and both take interlocks. > > Requested by: markj > Sponsored by: The FreeBSD Foundation > MFC after: 2 weeks > > Modified: > head/sys/kern/vfs_default.c > > Modified: head/sys/kern/vfs_default.c > > ============================================================================== > --- head/sys/kern/vfs_default.c Thu May 30 14:40:23 2019 (r348420) > +++ head/sys/kern/vfs_default.c Thu May 30 15:04:09 2019 (r348421) > @@ -1113,7 +1113,7 @@ vop_stdadd_writecount(struct vop_add_writecount_args > * > int error; > > vp = ap->a_vp; > - VI_LOCK(vp); > + VI_LOCK_FLAGS(vp, MTX_DUPOK); > if (vp->v_writecount < 0) { > error = ETXTBSY; > } else { > > Does this merit a comment justifying the use of DUPOK? -Ben