From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrey Tsyvarev Subject: Re: f2fs: BUG_ON() is triggered when mount valid f2fs filesystem Date: Wed, 16 Apr 2014 13:11:40 +0400 Message-ID: <534E494C.7050909@ispras.ru> References: <52F320FC.50803@ispras.ru> <534BC29B.3020408@ispras.ru> <1397559864.7727.5.camel@kjgkr> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1WaLsR-0005l9-1b for linux-f2fs-devel@lists.sourceforge.net; Wed, 16 Apr 2014 09:11:31 +0000 Received: from smtp.ispras.ru ([83.149.199.79]) by sog-mx-3.v43.ch3.sourceforge.com with esmtp (Exim 4.76) id 1WaLsO-00041R-UW for linux-f2fs-devel@lists.sourceforge.net; Wed, 16 Apr 2014 09:11:31 +0000 In-Reply-To: <1397559864.7727.5.camel@kjgkr> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net To: jaegeuk.kim@samsung.com Cc: linux-kernel , Alexey Khoroshilov , linux-f2fs-devel@lists.sourceforge.net SGksCgpXaXRoIHRoaXMgcGF0Y2ggbW91bnRpbmcgb2YgdGhlIGltYWdlIGNvbnRpbnVlcyB0byBm YWlsICh3aXRoIHNpbWlsYXIgCkJVR19PTikuCkJ1dCB3aGVuIGltYWdlIGlzIGZvcm1hdHRlZCBh Z2FpbiAoYW5kIHN0ZXBzIG1lbnRpb25lZCBpbiB0aGUgcHJldmlvdXMgCm1lc3NhZ2UgYXJlIHBl cmZvcm1lZCksCm1vdW50aW5nIG9mIGl0IGlzIG5vdyBzdWNjZWVkLgoKSXMgdGhpcyBpcyBhIHRy dWUgcHVycG9zZSBvZiB0aGUgcGF0Y2g/CgoxNS4wNC4yMDE0IDE1OjA0LCBKYWVnZXVrIEtpbSDQ v9C40YjQtdGCOgo+IEhpLAo+Cj4gVGhhbmsgeW91IGZvciB0aGUgcmVwb3J0Lgo+IEkgcmV0cmll dmVkIHRoZSBmYXVsdCBpbWFnZSBhbmQgZm91bmQgb3V0IHRoYXQgcHJldmlvdXMgZ2FyYmFnZSBk YXRhCj4gd3JlYWsgc3VjaCB0aGUgd3JvbmcgYmVoYXZpb3JzLgo+IFNvLCBJIHdyb3RlIHRoZSBm b2xsb3dpbmcgcGF0Y2ggdGhhdCBmaWxscyBvbmUgemVyby1ibG9jayBhdCB0aGUKPiBjaGVja3Bv aW50IHByb2NlZHVyZS4KPiBJZiB0aGUgdW5kZXJseWluZyBkZXZpY2Ugc3VwcG9ydHMgZGlzY2Fy ZCwgSSBleHBlY3QgdGhhdCBpdCBtb3N0bHkKPiBkb2Vzbid0IGluY3VyIGFueSBwZXJmb3JtYW5j ZSByZWdyZXNzaW9uIHNpZ25pZmljYW50bHkuCj4KPiBDb3VsZCB5b3UgdGVzdCB0aGlzIHBhdGNo Pwo+Cj4gPkZyb20gNjA1ODhjZWI3Mjc3YWFlMmE3OWU3ZjY3ZjUyMTdkMTI1NjcyMGQ3OCBNb24g U2VwIDE3IDAwOjAwOjAwIDIwMDEKPiBGcm9tOiBKYWVnZXVrIEtpbSA8amFlZ2V1ay5raW1Ac2Ft c3VuZy5jb20+Cj4gRGF0ZTogVHVlLCAxNSBBcHIgMjAxNCAxMzo1Nzo1NSArMDkwMAo+IFN1Ympl Y3Q6IFtQQVRDSF0gZjJmczogYXZvaWQgdG8gY29uZHVjdCByb2xsLWZvcndhcmQgZHVlIHRvIHRo ZSByZW1haW5lZAo+ICAgZ2FyYmFnZSBibG9ja3MKPgo+IFRoZSBmMmZzIGFsd2F5cyBzY2FucyB0 aGUgbmV4dCBjaGFpbiBvZiBkaXJlY3Qgbm9kZSBibG9ja3MuCj4gQnV0IHNvbWUgZ2FyYmFnZSBi bG9ja3MgYXJlIGFibGUgdG8gYmUgcmVtYWluZWQgZHVlIHRvIG5vIGRpc2NhcmQKPiBzdXBwb3J0 IG9yCj4gU1NSIHRyaWdnZXJzLgo+IFRoaXMgb2NjYXNpb25hbGx5IHdyZWFrcyByZWNvdmVyaW5n IHdyb25nIGlub2RlcyB0aGF0IHdlcmUgdXNlZCBvcgo+IEJVR19PTnMKPiBkdWUgdG8gcmVhbGxv Y2F0aW5nIG5vZGUgaWRzIGFzIGZvbGxvd3MuCj4KPiBXaGVuIG1vdW50IHRoaXMgZjJmcyBpbWFn ZToKPiBodHRwOi8vbGludXh0ZXN0aW5nLm9yZy9kb3dubG9hZHMvZjJmc19mYXVsdF9pbWFnZS56 aXAKPiBCVUdfT04gaXMgdHJpZ2dlcmVkIGluIGYyZnMgZHJpdmVyIChtZXNzYWdlcyBiZWxvdyBh cmUgZ2VuZXJhdGVkIG9uCj4ga2VybmVsIDMuMTMuMjsgZm9yIG90aGVyIGtlcm5lbHMgb3V0cHV0 IGlzIHNpbWlsYXIpOgo+Cj4ga2VybmVsIEJVRyBhdCBmcy9mMmZzL25vZGUuYzoyMTUhCj4gICBD YWxsIFRyYWNlOgo+ICAgWzxmZmZmZmZmZmEwMzJlYmFkPl0gcmVjb3Zlcl9pbm9kZV9wYWdlKzB4 MWZkLzB4M2UwIFtmMmZzXQo+ICAgWzxmZmZmZmZmZjgxMTQ0NmU3Pl0gPyBfX2xvY2tfcGFnZSsw eDY3LzB4NzAKPiAgIFs8ZmZmZmZmZmY4MTA4OTk5MD5dID8gYXV0b3JlbW92ZV93YWtlX2Z1bmN0 aW9uKzB4NTAvMHg1MAo+ICAgWzxmZmZmZmZmZmEwMzM3Nzg4Pl0gcmVjb3Zlcl9mc3luY19kYXRh KzB4MTM5OC8weDE1ZDAgW2YyZnNdCj4gICBbPGZmZmZmZmZmODEyYjllNWM+XSA/IHNlbGludXhf ZF9pbnN0YW50aWF0ZSsweDFjLzB4MjAKPiAgIFs8ZmZmZmZmZmY4MTFjYjIwYj5dID8gZF9pbnN0 YW50aWF0ZSsweDViLzB4ODAKPiAgIFs8ZmZmZmZmZmZhMDMyMTA0ND5dIGYyZnNfZmlsbF9zdXBl cisweGIwNC8weGJmMCBbZjJmc10KPiAgIFs8ZmZmZmZmZmY4MTFiODYxZT5dID8gbW91bnRfYmRl disweDdlLzB4MjEwCj4gICBbPGZmZmZmZmZmODExYjg3Njk+XSBtb3VudF9iZGV2KzB4MWM5LzB4 MjEwCj4gICBbPGZmZmZmZmZmYTAzMjA1NDA+XSA/IHZhbGlkYXRlX3N1cGVyYmxvY2srMHgyMTAv MHgyMTAgW2YyZnNdCj4gICBbPGZmZmZmZmZmYTAzMWNmOGQ+XSBmMmZzX21vdW50KzB4MWQvMHgz MCBbZjJmc10KPiAgIFs8ZmZmZmZmZmY4MTFiOTQ5Nz5dIG1vdW50X2ZzKzB4NDcvMHgxYzAKPiAg IFs8ZmZmZmZmZmY4MTE2NmUwMD5dID8gX19hbGxvY19wZXJjcHUrMHgxMC8weDIwCj4gICBbPGZm ZmZmZmZmODExZDQwMzI+XSB2ZnNfa2Vybl9tb3VudCsweDcyLzB4MTEwCj4gICBbPGZmZmZmZmZm ODExZDY3NjM+XSBkb19tb3VudCsweDQ5My8weDkxMAo+ICAgWzxmZmZmZmZmZjgxMTYxNWNiPl0g PyBzdHJuZHVwX3VzZXIrMHg1Yi8weDgwCj4gICBbPGZmZmZmZmZmODExZDZjNzA+XSBTeVNfbW91 bnQrMHg5MC8weGUwCj4gICBbPGZmZmZmZmZmODE2NmY4ZDk+XSBzeXN0ZW1fY2FsbF9mYXN0cGF0 aCsweDE2LzB4MWIKPgo+IEZvdW5kIGJ5IExpbnV4IEZpbGUgU3lzdGVtIFZlcmlmaWNhdGlvbiBw cm9qZWN0IChsaW51eHRlc3Rpbmcub3JnKS4KPgo+IFJlcG9ydGVkLWJ5OiBBbmRyZXkgVHN5dmFy ZXYgPHRzeXZhcmV2QGlzcHJhcy5ydT4KPiBTaWduZWQtb2ZmLWJ5OiBKYWVnZXVrIEtpbSA8amFl Z2V1ay5raW1Ac2Ftc3VuZy5jb20+Cj4gLS0tCj4gICBmcy9mMmZzL2NoZWNrcG9pbnQuYyB8ICA2 ICsrKysrKwo+ICAgZnMvZjJmcy9mMmZzLmggICAgICAgfCAgMSArCj4gICBmcy9mMmZzL3NlZ21l bnQuYyAgICB8IDE3ICsrKysrKysrKysrKysrKy0tCj4gICAzIGZpbGVzIGNoYW5nZWQsIDIyIGlu c2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZnMvZjJmcy9jaGVj a3BvaW50LmMgYi9mcy9mMmZzL2NoZWNrcG9pbnQuYwo+IGluZGV4IDRhYTUyMWEuLjg5MGUyM2Qg MTAwNjQ0Cj4gLS0tIGEvZnMvZjJmcy9jaGVja3BvaW50LmMKPiArKysgYi9mcy9mMmZzL2NoZWNr cG9pbnQuYwo+IEBAIC03NjIsNiArNzYyLDEyIEBAIHN0YXRpYyB2b2lkIGRvX2NoZWNrcG9pbnQo c3RydWN0IGYyZnNfc2JfaW5mbyAqc2JpLAo+IGJvb2wgaXNfdW1vdW50KQo+ICAgCXZvaWQgKmth ZGRyOwo+ICAgCWludCBpOwo+ICAgCj4gKwkvKgo+ICsJICogVGhpcyBhdm9pZHMgdG8gY29uZHVj dCB3cm9uZyByb2xsLWZvcndhcmQgb3BlcmF0aW9ucyBhbmQgdXNlcwo+ICsJICogbWV0YXBhZ2Vz LCBzbyBzaG91bGQgYmUgY2FsbGVkIHByaW9yIHRvIHN5bmNfbWV0YV9wYWdlcyBiZWxvdy4KPiAr CSAqLwo+ICsJZGlzY2FyZF9uZXh0X2Rub2RlKHNiaSk7Cj4gKwo+ICAgCS8qIEZsdXNoIGFsbCB0 aGUgTkFUL1NJVCBwYWdlcyAqLwo+ICAgCXdoaWxlIChnZXRfcGFnZXMoc2JpLCBGMkZTX0RJUlRZ X01FVEEpKQo+ICAgCQlzeW5jX21ldGFfcGFnZXMoc2JpLCBNRVRBLCBMT05HX01BWCk7Cj4gZGlm ZiAtLWdpdCBhL2ZzL2YyZnMvZjJmcy5oIGIvZnMvZjJmcy9mMmZzLmgKPiBpbmRleCAyZWNhYzgz Li4yYzVhNWRhIDEwMDY0NAo+IC0tLSBhL2ZzL2YyZnMvZjJmcy5oCj4gKysrIGIvZnMvZjJmcy9m MmZzLmgKPiBAQCAtMTE3OSw2ICsxMTc5LDcgQEAgaW50IGYyZnNfaXNzdWVfZmx1c2goc3RydWN0 IGYyZnNfc2JfaW5mbyAqKTsKPiAgIHZvaWQgaW52YWxpZGF0ZV9ibG9ja3Moc3RydWN0IGYyZnNf c2JfaW5mbyAqLCBibG9ja190KTsKPiAgIHZvaWQgcmVmcmVzaF9zaXRfZW50cnkoc3RydWN0IGYy ZnNfc2JfaW5mbyAqLCBibG9ja190LCBibG9ja190KTsKPiAgIHZvaWQgY2xlYXJfcHJlZnJlZV9z ZWdtZW50cyhzdHJ1Y3QgZjJmc19zYl9pbmZvICopOwo+ICt2b2lkIGRpc2NhcmRfbmV4dF9kbm9k ZShzdHJ1Y3QgZjJmc19zYl9pbmZvICopOwo+ICAgaW50IG5wYWdlc19mb3Jfc3VtbWFyeV9mbHVz aChzdHJ1Y3QgZjJmc19zYl9pbmZvICopOwo+ICAgdm9pZCBhbGxvY2F0ZV9uZXdfc2VnbWVudHMo c3RydWN0IGYyZnNfc2JfaW5mbyAqKTsKPiAgIHN0cnVjdCBwYWdlICpnZXRfc3VtX3BhZ2Uoc3Ry dWN0IGYyZnNfc2JfaW5mbyAqLCB1bnNpZ25lZCBpbnQpOwo+IGRpZmYgLS1naXQgYS9mcy9mMmZz L3NlZ21lbnQuYyBiL2ZzL2YyZnMvc2VnbWVudC5jCj4gaW5kZXggMWUyNjRlNy4uOTk5M2Y5NCAx MDA2NDQKPiAtLS0gYS9mcy9mMmZzL3NlZ21lbnQuYwo+ICsrKyBiL2ZzL2YyZnMvc2VnbWVudC5j Cj4gQEAgLTMzNSwxMyArMzM1LDI2IEBAIHN0YXRpYyB2b2lkIGxvY2F0ZV9kaXJ0eV9zZWdtZW50 KHN0cnVjdAo+IGYyZnNfc2JfaW5mbyAqc2JpLCB1bnNpZ25lZCBpbnQgc2Vnbm8pCj4gICAJbXV0 ZXhfdW5sb2NrKCZkaXJ0eV9pLT5zZWdsaXN0X2xvY2spOwo+ICAgfQo+ICAgCj4gLXN0YXRpYyB2 b2lkIGYyZnNfaXNzdWVfZGlzY2FyZChzdHJ1Y3QgZjJmc19zYl9pbmZvICpzYmksCj4gK3N0YXRp YyBpbnQgZjJmc19pc3N1ZV9kaXNjYXJkKHN0cnVjdCBmMmZzX3NiX2luZm8gKnNiaSwKPiAgIAkJ CQlibG9ja190IGJsa3N0YXJ0LCBibG9ja190IGJsa2xlbikKPiAgIHsKPiAgIAlzZWN0b3JfdCBz dGFydCA9IFNFQ1RPUl9GUk9NX0JMT0NLKHNiaSwgYmxrc3RhcnQpOwo+ICAgCXNlY3Rvcl90IGxl biA9IFNFQ1RPUl9GUk9NX0JMT0NLKHNiaSwgYmxrbGVuKTsKPiAtCWJsa2Rldl9pc3N1ZV9kaXNj YXJkKHNiaS0+c2ItPnNfYmRldiwgc3RhcnQsIGxlbiwgR0ZQX05PRlMsIDApOwo+ICAgCXRyYWNl X2YyZnNfaXNzdWVfZGlzY2FyZChzYmktPnNiLCBibGtzdGFydCwgYmxrbGVuKTsKPiArCXJldHVy biBibGtkZXZfaXNzdWVfZGlzY2FyZChzYmktPnNiLT5zX2JkZXYsIHN0YXJ0LCBsZW4sIEdGUF9O T0ZTLCAwKTsKPiArfQo+ICsKPiArdm9pZCBkaXNjYXJkX25leHRfZG5vZGUoc3RydWN0IGYyZnNf c2JfaW5mbyAqc2JpKQo+ICt7Cj4gKwlzdHJ1Y3QgY3Vyc2VnX2luZm8gKmN1cnNlZyA9IENVUlNF R19JKHNiaSwgQ1VSU0VHX1dBUk1fTk9ERSk7Cj4gKwlibG9ja190IGJsa2FkZHIgPSBORVhUX0ZS RUVfQkxLQUREUihzYmksIGN1cnNlZyk7Cj4gKwo+ICsJaWYgKGYyZnNfaXNzdWVfZGlzY2FyZChz YmksIGJsa2FkZHIsIDEpKSB7Cj4gKwkJc3RydWN0IHBhZ2UgKnBhZ2UgPSBncmFiX21ldGFfcGFn ZShzYmksIGJsa2FkZHIpOwo+ICsJCS8qIHplcm8tZmlsbGVkIHBhZ2UgKi8KPiArCQlzZXRfcGFn ZV9kaXJ0eShwYWdlKTsKPiArCQlmMmZzX3B1dF9wYWdlKHBhZ2UsIDEpOwo+ICsJfQo+ICAgfQo+ ICAgCj4gICBzdGF0aWMgdm9pZCBhZGRfZGlzY2FyZF9hZGRycyhzdHJ1Y3QgZjJmc19zYl9pbmZv ICpzYmksCgotLSAKQW5kcmV5IFRzeXZhcmV2ICA8dHN5dmFyZXZAaXNwcmFzLnJ1PgoKCi0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQpMZWFybiBHcmFwaCBEYXRhYmFzZXMgLSBEb3dubG9hZCBGUkVFIE8n UmVpbGx5IEJvb2sKIkdyYXBoIERhdGFiYXNlcyIgaXMgdGhlIGRlZmluaXRpdmUgbmV3IGd1aWRl IHRvIGdyYXBoIGRhdGFiYXNlcyBhbmQgdGhlaXIKYXBwbGljYXRpb25zLiBXcml0dGVuIGJ5IHRo cmVlIGFjY2xhaW1lZCBsZWFkZXJzIGluIHRoZSBmaWVsZCwKdGhpcyBmaXJzdCBlZGl0aW9uIGlz IG5vdyBhdmFpbGFibGUuIERvd25sb2FkIHlvdXIgZnJlZSBib29rIHRvZGF5IQpodHRwOi8vcC5z Zi5uZXQvc2Z1L05lb1RlY2gKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KTGludXgtZjJmcy1kZXZlbCBtYWlsaW5nIGxpc3QKTGludXgtZjJmcy1kZXZlbEBs aXN0cy5zb3VyY2Vmb3JnZS5uZXQKaHR0cHM6Ly9saXN0cy5zb3VyY2Vmb3JnZS5uZXQvbGlzdHMv bGlzdGluZm8vbGludXgtZjJmcy1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755256AbaDPJLc (ORCPT ); Wed, 16 Apr 2014 05:11:32 -0400 Received: from smtp.ispras.ru ([83.149.199.79]:43613 "EHLO smtp.ispras.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755036AbaDPJLZ (ORCPT ); Wed, 16 Apr 2014 05:11:25 -0400 Message-ID: <534E494C.7050909@ispras.ru> Date: Wed, 16 Apr 2014 13:11:40 +0400 From: Andrey Tsyvarev User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: jaegeuk.kim@samsung.com CC: linux-f2fs-devel@lists.sourceforge.net, linux-kernel , Alexey Khoroshilov Subject: Re: f2fs: BUG_ON() is triggered when mount valid f2fs filesystem References: <52F320FC.50803@ispras.ru> <534BC29B.3020408@ispras.ru> <1397559864.7727.5.camel@kjgkr> In-Reply-To: <1397559864.7727.5.camel@kjgkr> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, With this patch mounting of the image continues to fail (with similar BUG_ON). But when image is formatted again (and steps mentioned in the previous message are performed), mounting of it is now succeed. Is this is a true purpose of the patch? 15.04.2014 15:04, Jaegeuk Kim пишет: > Hi, > > Thank you for the report. > I retrieved the fault image and found out that previous garbage data > wreak such the wrong behaviors. > So, I wrote the following patch that fills one zero-block at the > checkpoint procedure. > If the underlying device supports discard, I expect that it mostly > doesn't incur any performance regression significantly. > > Could you test this patch? > > >From 60588ceb7277aae2a79e7f67f5217d1256720d78 Mon Sep 17 00:00:00 2001 > From: Jaegeuk Kim > Date: Tue, 15 Apr 2014 13:57:55 +0900 > Subject: [PATCH] f2fs: avoid to conduct roll-forward due to the remained > garbage blocks > > The f2fs always scans the next chain of direct node blocks. > But some garbage blocks are able to be remained due to no discard > support or > SSR triggers. > This occasionally wreaks recovering wrong inodes that were used or > BUG_ONs > due to reallocating node ids as follows. > > When mount this f2fs image: > http://linuxtesting.org/downloads/f2fs_fault_image.zip > BUG_ON is triggered in f2fs driver (messages below are generated on > kernel 3.13.2; for other kernels output is similar): > > kernel BUG at fs/f2fs/node.c:215! > Call Trace: > [] recover_inode_page+0x1fd/0x3e0 [f2fs] > [] ? __lock_page+0x67/0x70 > [] ? autoremove_wake_function+0x50/0x50 > [] recover_fsync_data+0x1398/0x15d0 [f2fs] > [] ? selinux_d_instantiate+0x1c/0x20 > [] ? d_instantiate+0x5b/0x80 > [] f2fs_fill_super+0xb04/0xbf0 [f2fs] > [] ? mount_bdev+0x7e/0x210 > [] mount_bdev+0x1c9/0x210 > [] ? validate_superblock+0x210/0x210 [f2fs] > [] f2fs_mount+0x1d/0x30 [f2fs] > [] mount_fs+0x47/0x1c0 > [] ? __alloc_percpu+0x10/0x20 > [] vfs_kern_mount+0x72/0x110 > [] do_mount+0x493/0x910 > [] ? strndup_user+0x5b/0x80 > [] SyS_mount+0x90/0xe0 > [] system_call_fastpath+0x16/0x1b > > Found by Linux File System Verification project (linuxtesting.org). > > Reported-by: Andrey Tsyvarev > Signed-off-by: Jaegeuk Kim > --- > fs/f2fs/checkpoint.c | 6 ++++++ > fs/f2fs/f2fs.h | 1 + > fs/f2fs/segment.c | 17 +++++++++++++++-- > 3 files changed, 22 insertions(+), 2 deletions(-) > > diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c > index 4aa521a..890e23d 100644 > --- a/fs/f2fs/checkpoint.c > +++ b/fs/f2fs/checkpoint.c > @@ -762,6 +762,12 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, > bool is_umount) > void *kaddr; > int i; > > + /* > + * This avoids to conduct wrong roll-forward operations and uses > + * metapages, so should be called prior to sync_meta_pages below. > + */ > + discard_next_dnode(sbi); > + > /* Flush all the NAT/SIT pages */ > while (get_pages(sbi, F2FS_DIRTY_META)) > sync_meta_pages(sbi, META, LONG_MAX); > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index 2ecac83..2c5a5da 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -1179,6 +1179,7 @@ int f2fs_issue_flush(struct f2fs_sb_info *); > void invalidate_blocks(struct f2fs_sb_info *, block_t); > void refresh_sit_entry(struct f2fs_sb_info *, block_t, block_t); > void clear_prefree_segments(struct f2fs_sb_info *); > +void discard_next_dnode(struct f2fs_sb_info *); > int npages_for_summary_flush(struct f2fs_sb_info *); > void allocate_new_segments(struct f2fs_sb_info *); > struct page *get_sum_page(struct f2fs_sb_info *, unsigned int); > diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c > index 1e264e7..9993f94 100644 > --- a/fs/f2fs/segment.c > +++ b/fs/f2fs/segment.c > @@ -335,13 +335,26 @@ static void locate_dirty_segment(struct > f2fs_sb_info *sbi, unsigned int segno) > mutex_unlock(&dirty_i->seglist_lock); > } > > -static void f2fs_issue_discard(struct f2fs_sb_info *sbi, > +static int f2fs_issue_discard(struct f2fs_sb_info *sbi, > block_t blkstart, block_t blklen) > { > sector_t start = SECTOR_FROM_BLOCK(sbi, blkstart); > sector_t len = SECTOR_FROM_BLOCK(sbi, blklen); > - blkdev_issue_discard(sbi->sb->s_bdev, start, len, GFP_NOFS, 0); > trace_f2fs_issue_discard(sbi->sb, blkstart, blklen); > + return blkdev_issue_discard(sbi->sb->s_bdev, start, len, GFP_NOFS, 0); > +} > + > +void discard_next_dnode(struct f2fs_sb_info *sbi) > +{ > + struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_WARM_NODE); > + block_t blkaddr = NEXT_FREE_BLKADDR(sbi, curseg); > + > + if (f2fs_issue_discard(sbi, blkaddr, 1)) { > + struct page *page = grab_meta_page(sbi, blkaddr); > + /* zero-filled page */ > + set_page_dirty(page); > + f2fs_put_page(page, 1); > + } > } > > static void add_discard_addrs(struct f2fs_sb_info *sbi, -- Andrey Tsyvarev