From owner-svn-src-all@freebsd.org Mon Jul 25 11:42:44 2016 Return-Path: Delivered-To: svn-src-all@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 D3BC2BA3D98; Mon, 25 Jul 2016 11:42:44 +0000 (UTC) (envelope-from mizhka@gmail.com) Received: from mail-pf0-x22d.google.com (mail-pf0-x22d.google.com [IPv6:2607:f8b0:400e:c00::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A128D13A1; Mon, 25 Jul 2016 11:42:44 +0000 (UTC) (envelope-from mizhka@gmail.com) Received: by mail-pf0-x22d.google.com with SMTP id x72so63541585pfd.2; Mon, 25 Jul 2016 04:42:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=Jv0NnXwhzRLHxp8dSXZjMLaXsBReGknnCYg7+0VITfU=; b=X2NvHZZ2x02DGubYvhQAZmhKnoTzEMQaTvir4LWFgkrLhogRB4Rw+Xbhg0qDSp1mEY enru0Y9gDU07wow3JdAIocA84nt318LDMOyJxft3sfX2dJQecsG1fmXkqbeUMynWfHiE nZgavBlBHV9vSWEWr/cNXoS5ZLuKBK23hJry7qZXogBDEWtDScEPNtHeuFhozzw7hUZU hiCQt7j1ZzUDLzqRpiAEDA4LHC6NHSj4UivIh4niSAiCsQmHIIgbjRP5iic6XiR+MFNT Cjit4PC/LictbaDiHvX8g4kZtNccpSsXURaKcLr79/mfkYVdkJE5o0OD1P8ks4IweQiN Jypw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=Jv0NnXwhzRLHxp8dSXZjMLaXsBReGknnCYg7+0VITfU=; b=OzZr6NzpO3So1jAh3WaWAbErdvkJq98unJLRuThD2osuslXEa5AFLcXporZtSPV930 WGW+32LYFafowytshffCkDMWPZkd3O0UTYSHKL3YA8rhbw1gE8RvBFTxGGKBCNi52/sg vLqe4YhKCpB8mnY26BW007u3I4o46dq8SPorE+pVhdhyLrZ3MnXywiMrgdjZsTodUpf1 r5Jz4+YBlK8hxv2jtZw7uJkyu+wAx2cVqu+azj22cspOA1iozUDsqOCBcKkDwzQFF89L 2OgBi1vLNWZaL1z1YHcKSm0YgY+Kkh3ibpkybzjpxigHU+Qbb1QW2QC+DIMBFKIH3ztG pxrA== X-Gm-Message-State: AEkoousT4boUF1xjdRiuWdVDRxXWQbPnN2VAqNPzgoU3xtTWe9h3tbTbceaZnInH72fjRQBtEtQNT5fkib5eBA== X-Received: by 10.98.43.68 with SMTP id r65mr28599657pfr.148.1469446964083; Mon, 25 Jul 2016 04:42:44 -0700 (PDT) MIME-Version: 1.0 Received: by 10.66.5.67 with HTTP; Mon, 25 Jul 2016 04:42:43 -0700 (PDT) In-Reply-To: <20160724204431.GM1076@FreeBSD.org> References: <201607241035.u6OAZijR023467@repo.freebsd.org> <76ecf576-3b05-9a58-9c58-6b45f49b7286@freebsd.org> <20160724204431.GM1076@FreeBSD.org> From: Michael Zhilin Date: Mon, 25 Jul 2016 14:42:43 +0300 Message-ID: Subject: Re: svn commit: r303264 - head/usr.bin/calendar/calendars/ru_RU.UTF-8 To: Gleb Smirnoff Cc: Andrey Chernov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: base64 X-Content-Filtered-By: Mailman/MimeDel 2.1.22 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 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, 25 Jul 2016 11:42:44 -0000 SGkgR2xlYiwgQW5kcmV5LA0KDQpDb3VsZCB5b3UgcGxlYXNlIGZpeCBvbmUgbW9yZSBsaW5lIGlu DQp1c3IuYmluL2NhbGVuZGFyL2NhbGVuZGFycy9ydV9SVS5VVEYtOC9jYWxlbmRhci5jb21tb246 DQogPj4gNyDQvdC+0Y/QsS4gICAg0JTQtdC90Ywg0L7QutGCLtGP0LHRgNGM0YHQutC+0Lkg0YDQ tdCy0L7Qu9GO0YbQuNC4IDE5MTcg0LPQvtC00LANCg0KQlRXLCB0aGUgbGluZSBvZiAidXNyLmJp bi9jYWxlbmRhci9jYWxlbmRhcnMvcnVfUlUuVVRGLTgvY2FsZW5kYXIubWlsaXRhcnkiDQpwcm9i YWJseSBoYXMgaW5jb3JyZWN0IGRhdGU6DQogPj4gNyDQvdC+0Y/QsS4gICAg0JTQtdC90Ywg0L7R gdCy0L7QsdC+0LbQtNC10L3QuNGPINCc0L7RgdC60LLRiyDRgdC40LvQsNC80Lgg0L3QsNGA0L7Q tNC90L7Qs9C+INC+0L/QvtC70YfQtdC90LjRjyDQv9C+0LQNCtGA0YPQutC+0LLQvtC00YHRgtCy 0L7QvCDQmtGD0LfRjNC80Ysg0JzQuNC90LjQvdCwINC4INCU0LzQuNGC0YDQuNGPINCf0L7QttCw 0YDRgdC60L7Qs9C+INC+0YIg0L/QvtC70YzRgdC60LjRhSDQuNC90YLQtdGA0LLQtdC90YLQvtCy DQooMTYxMiDQs9C+0LQpDQoNCkkgc3VwcG9zZSBpdCBzaG91bGQgYmUgNHRoIG9mIE5vdmVtYmVy IDopDQoNClRoYW5rIHlvdSwNCiAgTWljaGFlbCENCg0KMjAxNi0wNy0yNCAyMzo0NCBHTVQrMDM6 MDAgR2xlYiBTbWlybm9mZiA8Z2xlYml1c0BmcmVlYnNkLm9yZz46DQoNCj4gICBBbmRyZXksDQo+ DQo+ICAgdGhhbmtzLCBJIHdpbGwgZml4IHRoYXQuIFRydXN0aW5nIHNjcmlwdCBhbmQgbm90IGNo ZWNraW5nIHJlc3VsdHMgd2FzDQo+IHN0dXBpZC4NCj4NCj4gT24gU3VuLCBKdWwgMjQsIDIwMTYg YXQgMDY6MTY6MjZQTSArMDMwMCwgQW5kcmV5IENoZXJub3Ygd3JvdGU6DQo+IEE+IFdoYXQgaGFw cGVucyB3aXRoIHRoZSBsaW5lcyBiZWxvdz8NCj4gQT4NCj4gQT4gT24gMjQuMDcuMjAxNiAxMzoz NSwgR2xlYiBTbWlybm9mZiB3cm90ZToNCj4gQT4gPiBNb2RpZmllZDoNCj4gaGVhZC91c3IuYmlu L2NhbGVuZGFyL2NhbGVuZGFycy9ydV9SVS5VVEYtOC9jYWxlbmRhci5vcnRob2RveA0KPiBBPiA+ IC3Qn9Cw0YHRhdCwLTcgICDQktGF0L7QtCDQk9C+0YHQv9C+0LTQtdC90Ywg0LIg0JjQtdGA0YPR gdCw0LvQuNC8LiDQktC10YDQsdC90L7QtSDQktC+0YHQutGA0LXRgdC10L3RjNC1DQo+IEE+ID4g K9Cf0LDRgdGF0LAtNyAgINCS0YXQvtC0INCT0L7RgdC/0L7QtNC10L3RjCDQsiDQmNC10YDRg9GB 0LDQu9C40LwuINCS0LXRgNCx0L3QvtC1INCS0L7RgdC60YDQtdGB0LXQvdGCLtGM0LUNCj4gQT4g PiAr0J/QsNGB0YXQsCAgICAg0JLQvtGB0LrRgNC10YHQtdC90YIu0LjQtSDQpdGA0LjRgdGC0L7Q stC+DQo+IEE+ID4gK9Cf0LDRgdGF0LArMzkgINCS0L7Qt9C90LXRgdC10L3Rgi7QuNC1DQo+IEE+ DQo+IEE+ID4gTW9kaWZpZWQ6IGhlYWQvdXNyLmJpbi9jYWxlbmRhci9jYWxlbmRhcnMvcnVfUlUu VVRGLTgvY2FsZW5kYXIucGFnYW4NCj4gQT4gPiAtMTQg0LzQsNGAICAgINCd0L7QstGL0Lkg0JPQ vtC0LCDQntCy0YHQtdC90Ywg0LzQsNC70YvQuQ0KPiBBPiA+ICsxNCDQvNCw0YDRgtCwICDQndC+ 0LLRi9C5INCT0L7QtCwg0J7QstGB0LXQvdGCLtGMINC80LDQu9GL0LkNCj4gQT4gPiAtMjAg0LzQ sNGAKiAgINCS0LXRgdC10L3QvdC40LUg0YDQsNCy0L3QvtC00LXQvdGB0YLQstC40LUNCj4gQT4g PiAtIDcg0LDQv9GAICAgINCU0LXQvdGMINCc0LDRgNC10L3RiyAo0YHQtNCy0LjQvdGD0YLQvtC1 INCy0LXRgdC10L3QvdC10LUg0YDQsNCy0L3QvtC00LXQvdGB0YLQstC40LUpDQo+IEE+ID4gKzIw INC80LDRgNGC0LAqINCS0LXRgdC10L3Rgi7QvdC40LUg0YDQsNCy0L3QvtC00LXQvdGB0YLQstC4 0LUNCj4gQT4gPiArIDcg0LDQv9GALiAgINCU0LXQvdGMINCc0LDRgNC10L3RiyAo0YHQtNCy0LjQ vdGD0YLQvtC1INCy0LXRgdC10L3Rgi7QvdC10LUg0YDQsNCy0L3QvtC00LXQvdGB0YLQstC40LUp DQo+IEE+ID4gKyA2INC80LDRjyAgICDQlNC10L3RjCDQlNCw0LbRjNCx0L7Qs9CwLCDQntCy0YHQ tdC90YIu0Ywg0LHQvtC70YzRiNC+0LkNCj4gQT4NCj4NCj4gLS0NCj4gVG90dXMgdHV1cywgR2xl Yml1cy4NCj4NCj4NCg== From owner-svn-src-all@freebsd.org Mon Jul 25 13:29:00 2016 Return-Path: Delivered-To: svn-src-all@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 4B0D7BA3FBE; Mon, 25 Jul 2016 13:29:00 +0000 (UTC) (envelope-from kib@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 163C41206; Mon, 25 Jul 2016 13:29:00 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6PDSxMP020854; Mon, 25 Jul 2016 13:28:59 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6PDSxHe020852; Mon, 25 Jul 2016 13:28:59 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201607251328.u6PDSxHe020852@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 25 Jul 2016 13:28:59 +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: r303290 - in stable/11/sys: kern vm X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 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, 25 Jul 2016 13:29:00 -0000 Author: kib Date: Mon Jul 25 13:28:59 2016 New Revision: 303290 URL: https://svnweb.freebsd.org/changeset/base/303290 Log: MFC r302567: In vgonel(), postpone setting BO_DEAD until VOP_RECLAIM() is called, if vnode is VMIO. For VMIO vnodes, set BO_DEAD in vm_object_terminate(). MFC r302580: Fix grammar. Approved by: re (gjb) Modified: stable/11/sys/kern/vfs_subr.c stable/11/sys/vm/vm_object.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/kern/vfs_subr.c ============================================================================== --- stable/11/sys/kern/vfs_subr.c Mon Jul 25 11:25:33 2016 (r303289) +++ stable/11/sys/kern/vfs_subr.c Mon Jul 25 13:28:59 2016 (r303290) @@ -3232,7 +3232,13 @@ vgonel(struct vnode *vp) TAILQ_EMPTY(&vp->v_bufobj.bo_clean.bv_hd) && vp->v_bufobj.bo_clean.bv_cnt == 0, ("vp %p bufobj not invalidated", vp)); - vp->v_bufobj.bo_flag |= BO_DEAD; + + /* + * For VMIO bufobj, BO_DEAD is set in vm_object_terminate() + * after the object's page queue is flushed. + */ + if (vp->v_bufobj.bo_object == NULL) + vp->v_bufobj.bo_flag |= BO_DEAD; BO_UNLOCK(&vp->v_bufobj); /* Modified: stable/11/sys/vm/vm_object.c ============================================================================== --- stable/11/sys/vm/vm_object.c Mon Jul 25 11:25:33 2016 (r303289) +++ stable/11/sys/vm/vm_object.c Mon Jul 25 13:28:59 2016 (r303290) @@ -741,6 +741,10 @@ vm_object_terminate(vm_object_t object) vinvalbuf(vp, V_SAVE, 0, 0); + BO_LOCK(&vp->v_bufobj); + vp->v_bufobj.bo_flag |= BO_DEAD; + BO_UNLOCK(&vp->v_bufobj); + VM_OBJECT_WLOCK(object); }