From owner-svn-src-stable@freebsd.org Sat Sep 30 18:32:02 2017 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3757CE2CAB1; Sat, 30 Sep 2017 18:32:02 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F23D777A90; Sat, 30 Sep 2017 18:32:01 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8UIW1Kn086796; Sat, 30 Sep 2017 18:32:01 GMT (envelope-from alc@FreeBSD.org) Received: (from alc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8UIW14q086795; Sat, 30 Sep 2017 18:32:01 GMT (envelope-from alc@FreeBSD.org) Message-Id: <201709301832.v8UIW14q086795@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: alc set sender to alc@FreeBSD.org using -f From: Alan Cox Date: Sat, 30 Sep 2017 18:32:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r324128 - stable/11/sys/net X-SVN-Group: stable-11 X-SVN-Commit-Author: alc X-SVN-Commit-Paths: stable/11/sys/net X-SVN-Commit-Revision: 324128 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Sep 2017 18:32:02 -0000 Author: alc Date: Sat Sep 30 18:32:00 2017 New Revision: 324128 URL: https://svnweb.freebsd.org/changeset/base/324128 Log: MFC r323786 In r288122, we changed vm_page_unwire() so that it returns a Boolean indicating whether the page's wire count transitioned to zero. Use that return value in zbuf_page_free() rather than checking the wire count. Modified: stable/11/sys/net/bpf_zerocopy.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/net/bpf_zerocopy.c ============================================================================== --- stable/11/sys/net/bpf_zerocopy.c Sat Sep 30 18:23:45 2017 (r324127) +++ stable/11/sys/net/bpf_zerocopy.c Sat Sep 30 18:32:00 2017 (r324128) @@ -114,8 +114,7 @@ zbuf_page_free(vm_page_t pp) { vm_page_lock(pp); - vm_page_unwire(pp, PQ_INACTIVE); - if (pp->wire_count == 0 && pp->object == NULL) + if (vm_page_unwire(pp, PQ_INACTIVE) && pp->object == NULL) vm_page_free(pp); vm_page_unlock(pp); }