From mboxrd@z Thu Jan 1 00:00:00 1970 From: Changman Lee Subject: Re: [f2fs-dev] [PATCH 1/4] f2fs: reorganize the f2fs_setattr() function. Date: Mon, 10 Jun 2013 09:38:32 +0900 Message-ID: <1370824712.22405.18.camel@lcm> References: <1370694303-2738-1-git-send-email-linkinjeon@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Ulq9Z-0007FY-Dx for linux-f2fs-devel@lists.sourceforge.net; Mon, 10 Jun 2013 00:40:09 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by sog-mx-1.v43.ch3.sourceforge.com with esmtp (Exim 4.76) id 1Ulq9X-00031t-58 for linux-f2fs-devel@lists.sourceforge.net; Mon, 10 Jun 2013 00:40:09 +0000 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MO500K6OJ6GBCB0@mailout3.samsung.com> for linux-f2fs-devel@lists.sourceforge.net; Mon, 10 Jun 2013 09:40:00 +0900 (KST) In-reply-to: <1370694303-2738-1-git-send-email-linkinjeon@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net To: Namjae Jeon Cc: Namjae Jeon , linux-kernel@vger.kernel.org, Pankaj Kumar , linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org SGVsbG8sIE5hbWphZQoKSWYgdXNpbmcgQUNMLCB3aGVuZXZlciBpX21vZGUgaXMgY2hhbmdlZCB3 ZSBzaG91bGQgdXBkYXRlIGFjbF9tb2RlIHdoaWNoCmlzIHdyaXR0ZW4gdG8geGF0dHIgYmxvY2ss IHRvby4gQW5kIHZpY2UgdmVyc2EuCkJlY2F1c2UgdXBkYXRlX2lub2RlKCkgaXMgY2FsbGVkIGF0 IGFueSByZWFzb24gYW5kIGFueXRpbWUsIHNvIHdlIHNob3VsZApzeW5jIGJvdGggdGhlIG1vbWVu dCB4YXR0ciBpcyB3cml0dGVuLgpXZSBkb24ndCBob3BlIHRoYXQgb25seSBpX21vZGUgaXMgd3Jp dHRlbiB0byBkaXNrIGFuZCB4YXR0ciBpcyBub3QuIFNvCmYyZnNfc2V0YXR0ciBpcyBkaXJ0eS4K CkFuZCwgYmVsb3cgY29kZSBoYXMgYSBidWcuIFdoZW4gZXJyb3IgaXMgb2NjdXJyZWQsIGlub2Rl LT5pX21vZGUKc2hvdWxkbid0IGJlIGNoYW5nZWQuIFBsZWFzZSwgY2hlY2sgb25lIG1vcmUgdGlt ZSwgTmFtamFlLgoKZGlmZiAtLWdpdCBhL2ZzL2YyZnMvZmlsZS5jIGIvZnMvZjJmcy9maWxlLmMK aW5kZXggZGVlZmQyNS4uMjljZDQ0OSAxMDA2NDQKLS0tIGEvZnMvZjJmcy9maWxlLmMKKysrIGIv ZnMvZjJmcy9maWxlLmMKQEAgLTM1MiwxMCArMzUyLDggQEAgaW50IGYyZnNfc2V0YXR0cihzdHJ1 Y3QgZGVudHJ5ICpkZW50cnksIHN0cnVjdAppYXR0ciAqYXR0cikKIAogICAgICAgIGlmIChhdHRy LT5pYV92YWxpZCAmIEFUVFJfTU9ERSkgewogICAgICAgICAgICAgICAgZXJyID0gZjJmc19hY2xf Y2htb2QoaW5vZGUpOwotICAgICAgICAgICAgICAgaWYgKGVyciB8fCBpc19pbm9kZV9mbGFnX3Nl dChmaSwgRklfQUNMX01PREUpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgIGlub2RlLT5pX21v ZGUgPSBmaS0+aV9hY2xfbW9kZTsKKyAgICAgICAgICAgICAgIGlmIChlcnIgfHwgaXNfaW5vZGVf ZmxhZ19zZXQoZmksIEZJX0FDTF9NT0RFKSkKICAgICAgICAgICAgICAgICAgICAgICAgY2xlYXJf aW5vZGVfZmxhZyhmaSwgRklfQUNMX01PREUpOwotICAgICAgICAgICAgICAgfQogICAgICAgIH0K ClRoYW5rcy4KCgpPbiDthqAsIDIwMTMtMDYtMDggYXQgMjE6MjUgKzA5MDAsIE5hbWphZSBKZW9u IHdyb3RlOgo+IEZyb206IE5hbWphZSBKZW9uIDxuYW1qYWUuamVvbkBzYW1zdW5nLmNvbT4KPiAK PiBSZW1vdmUgdGhlIHJlZHVuZGFudCBjb2RlIGZyb20gdGhpcyBmdW5jdGlvbiBhbmQgbWFrZSBp dCBhbGlnbmVkIHdpdGgKPiB1c2FnZXMgb2YgbGF0ZXN0IGdlbmVyaWMgdmZzIGxheWVyIGZ1bmN0 aW9uIGUuZyB1c2luZyB0aGUgc2V0YXR0cl9jb3B5KCkKPiBpbnN0ZWFkIG9mIHVzaW5nIHRoZSBm MmZzIHNwZWNpZmljIGZ1bmN0aW9uLgo+IAo+IEFsc28gY29ycmVjdCB0aGUgY29uZGl0aW9uIGZv ciB1cGRhdGluZyB0aGUgc2l6ZSBvZiBmaWxlIHZpYQo+IHRydW5jYXRlX3NldHNpemUoKS4KPiAK PiBTaWduZWQtb2ZmLWJ5OiBOYW1qYWUgSmVvbiA8bmFtamFlLmplb25Ac2Ftc3VuZy5jb20+Cj4g U2lnbmVkLW9mZi1ieTogUGFua2FqIEt1bWFyIDxwYW5rYWoua21Ac2Ftc3VuZy5jb20+Cj4gLS0t Cj4gIGZzL2YyZnMvYWNsLmMgIHwgICAgNSArLS0tLQo+ICBmcy9mMmZzL2ZpbGUuYyB8ICAgNDcg KysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KPiAgMiBmaWxl cyBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDQ2IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1n aXQgYS9mcy9mMmZzL2FjbC5jIGIvZnMvZjJmcy9hY2wuYwo+IGluZGV4IDQ0YWJjMmYuLjJkMTNm NDQgMTAwNjQ0Cj4gLS0tIGEvZnMvZjJmcy9hY2wuYwo+ICsrKyBiL2ZzL2YyZnMvYWNsLmMKPiBA QCAtMTcsOSArMTcsNiBAQAo+ICAjaW5jbHVkZSAieGF0dHIuaCIKPiAgI2luY2x1ZGUgImFjbC5o Igo+ICAKPiAtI2RlZmluZSBnZXRfaW5vZGVfbW9kZShpKQkoKGlzX2lub2RlX2ZsYWdfc2V0KEYy RlNfSShpKSwgRklfQUNMX01PREUpKSA/IFwKPiAtCQkJCQkoRjJGU19JKGkpLT5pX2FjbF9tb2Rl KSA6ICgoaSktPmlfbW9kZSkpCj4gLQo+ICBzdGF0aWMgaW5saW5lIHNpemVfdCBmMmZzX2FjbF9z aXplKGludCBjb3VudCkKPiAgewo+ICAJaWYgKGNvdW50IDw9IDQpIHsKPiBAQCAtMjk5LDcgKzI5 Niw3IEBAIGludCBmMmZzX2FjbF9jaG1vZChzdHJ1Y3QgaW5vZGUgKmlub2RlKQo+ICAJc3RydWN0 IGYyZnNfc2JfaW5mbyAqc2JpID0gRjJGU19TQihpbm9kZS0+aV9zYik7Cj4gIAlzdHJ1Y3QgcG9z aXhfYWNsICphY2w7Cj4gIAlpbnQgZXJyb3I7Cj4gLQl1bW9kZV90IG1vZGUgPSBnZXRfaW5vZGVf bW9kZShpbm9kZSk7Cj4gKwl1bW9kZV90IG1vZGUgPSBpbm9kZS0+aV9tb2RlOwo+ICAKPiAgCWlm ICghdGVzdF9vcHQoc2JpLCBQT1NJWF9BQ0wpKQo+ICAJCXJldHVybiAwOwo+IGRpZmYgLS1naXQg YS9mcy9mMmZzL2ZpbGUuYyBiL2ZzL2YyZnMvZmlsZS5jCj4gaW5kZXggZGVlZmQyNS4uOGRmYzFk YSAxMDA2NDQKPiAtLS0gYS9mcy9mMmZzL2ZpbGUuYwo+ICsrKyBiL2ZzL2YyZnMvZmlsZS5jCj4g QEAgLTMwMCw2MyArMzAwLDI2IEBAIHN0YXRpYyBpbnQgZjJmc19nZXRhdHRyKHN0cnVjdCB2ZnNt b3VudCAqbW50LAo+ICAJcmV0dXJuIDA7Cj4gIH0KPiAgCj4gLSNpZmRlZiBDT05GSUdfRjJGU19G U19QT1NJWF9BQ0wKPiAtc3RhdGljIHZvaWQgX19zZXRhdHRyX2NvcHkoc3RydWN0IGlub2RlICpp bm9kZSwgY29uc3Qgc3RydWN0IGlhdHRyICphdHRyKQo+IC17Cj4gLQlzdHJ1Y3QgZjJmc19pbm9k ZV9pbmZvICpmaSA9IEYyRlNfSShpbm9kZSk7Cj4gLQl1bnNpZ25lZCBpbnQgaWFfdmFsaWQgPSBh dHRyLT5pYV92YWxpZDsKPiAtCj4gLQlpZiAoaWFfdmFsaWQgJiBBVFRSX1VJRCkKPiAtCQlpbm9k ZS0+aV91aWQgPSBhdHRyLT5pYV91aWQ7Cj4gLQlpZiAoaWFfdmFsaWQgJiBBVFRSX0dJRCkKPiAt CQlpbm9kZS0+aV9naWQgPSBhdHRyLT5pYV9naWQ7Cj4gLQlpZiAoaWFfdmFsaWQgJiBBVFRSX0FU SU1FKQo+IC0JCWlub2RlLT5pX2F0aW1lID0gdGltZXNwZWNfdHJ1bmMoYXR0ci0+aWFfYXRpbWUs Cj4gLQkJCQkJCWlub2RlLT5pX3NiLT5zX3RpbWVfZ3Jhbik7Cj4gLQlpZiAoaWFfdmFsaWQgJiBB VFRSX01USU1FKQo+IC0JCWlub2RlLT5pX210aW1lID0gdGltZXNwZWNfdHJ1bmMoYXR0ci0+aWFf bXRpbWUsCj4gLQkJCQkJCWlub2RlLT5pX3NiLT5zX3RpbWVfZ3Jhbik7Cj4gLQlpZiAoaWFfdmFs aWQgJiBBVFRSX0NUSU1FKQo+IC0JCWlub2RlLT5pX2N0aW1lID0gdGltZXNwZWNfdHJ1bmMoYXR0 ci0+aWFfY3RpbWUsCj4gLQkJCQkJCWlub2RlLT5pX3NiLT5zX3RpbWVfZ3Jhbik7Cj4gLQlpZiAo aWFfdmFsaWQgJiBBVFRSX01PREUpIHsKPiAtCQl1bW9kZV90IG1vZGUgPSBhdHRyLT5pYV9tb2Rl Owo+IC0KPiAtCQlpZiAoIWluX2dyb3VwX3AoaW5vZGUtPmlfZ2lkKSAmJiAhY2FwYWJsZShDQVBf RlNFVElEKSkKPiAtCQkJbW9kZSAmPSB+U19JU0dJRDsKPiAtCQlzZXRfYWNsX2lub2RlKGZpLCBt b2RlKTsKPiAtCX0KPiAtfQo+IC0jZWxzZQo+IC0jZGVmaW5lIF9fc2V0YXR0cl9jb3B5IHNldGF0 dHJfY29weQo+IC0jZW5kaWYKPiAtCj4gIGludCBmMmZzX3NldGF0dHIoc3RydWN0IGRlbnRyeSAq ZGVudHJ5LCBzdHJ1Y3QgaWF0dHIgKmF0dHIpCj4gIHsKPiAgCXN0cnVjdCBpbm9kZSAqaW5vZGUg PSBkZW50cnktPmRfaW5vZGU7Cj4gLQlzdHJ1Y3QgZjJmc19pbm9kZV9pbmZvICpmaSA9IEYyRlNf SShpbm9kZSk7Cj4gIAlpbnQgZXJyOwo+ICAKPiAgCWVyciA9IGlub2RlX2NoYW5nZV9vayhpbm9k ZSwgYXR0cik7Cj4gIAlpZiAoZXJyKQo+ICAJCXJldHVybiBlcnI7Cj4gIAo+IC0JaWYgKChhdHRy LT5pYV92YWxpZCAmIEFUVFJfU0laRSkgJiYKPiAtCQkJYXR0ci0+aWFfc2l6ZSAhPSBpX3NpemVf cmVhZChpbm9kZSkpIHsKPiAtCQl0cnVuY2F0ZV9zZXRzaXplKGlub2RlLCBhdHRyLT5pYV9zaXpl KTsKPiArCWlmICgoYXR0ci0+aWFfdmFsaWQgJiBBVFRSX1NJWkUpKSB7Cj4gKwkJaWYgKGF0dHIt PmlhX3NpemUgIT0gaV9zaXplX3JlYWQoaW5vZGUpKQo+ICsJCQl0cnVuY2F0ZV9zZXRzaXplKGlu b2RlLCBhdHRyLT5pYV9zaXplKTsKPiAgCQlmMmZzX3RydW5jYXRlKGlub2RlKTsKPiAgCQlmMmZz X2JhbGFuY2VfZnMoRjJGU19TQihpbm9kZS0+aV9zYikpOwo+ICAJfQo+ICAKPiAtCV9fc2V0YXR0 cl9jb3B5KGlub2RlLCBhdHRyKTsKPiArCXNldGF0dHJfY29weShpbm9kZSwgYXR0cik7Cj4gIAo+ IC0JaWYgKGF0dHItPmlhX3ZhbGlkICYgQVRUUl9NT0RFKSB7Cj4gKwlpZiAoYXR0ci0+aWFfdmFs aWQgJiBBVFRSX01PREUpCj4gIAkJZXJyID0gZjJmc19hY2xfY2htb2QoaW5vZGUpOwo+IC0JCWlm IChlcnIgfHwgaXNfaW5vZGVfZmxhZ19zZXQoZmksIEZJX0FDTF9NT0RFKSkgewo+IC0JCQlpbm9k ZS0+aV9tb2RlID0gZmktPmlfYWNsX21vZGU7Cj4gLQkJCWNsZWFyX2lub2RlX2ZsYWcoZmksIEZJ X0FDTF9NT0RFKTsKPiAtCQl9Cj4gLQl9Cj4gIAo+ICAJbWFya19pbm9kZV9kaXJ0eShpbm9kZSk7 Cj4gIAlyZXR1cm4gZXJyOwoKCgotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KSG93IFNlcnZpY2VOb3cg aGVscHMgSVQgcGVvcGxlIHRyYW5zZm9ybSBJVCBkZXBhcnRtZW50czoKMS4gQSBjbG91ZCBzZXJ2 aWNlIHRvIGF1dG9tYXRlIElUIGRlc2lnbiwgdHJhbnNpdGlvbiBhbmQgb3BlcmF0aW9ucwoyLiBE YXNoYm9hcmRzIHRoYXQgb2ZmZXIgaGlnaC1sZXZlbCB2aWV3cyBvZiBlbnRlcnByaXNlIHNlcnZp Y2VzCjMuIEEgc2luZ2xlIHN5c3RlbSBvZiByZWNvcmQgZm9yIGFsbCBJVCBwcm9jZXNzZXMKaHR0 cDovL3Auc2YubmV0L3NmdS9zZXJ2aWNlbm93LWQyZC1qCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkxpbnV4LWYyZnMtZGV2ZWwgbWFpbGluZyBsaXN0Ckxp bnV4LWYyZnMtZGV2ZWxAbGlzdHMuc291cmNlZm9yZ2UubmV0Cmh0dHBzOi8vbGlzdHMuc291cmNl Zm9yZ2UubmV0L2xpc3RzL2xpc3RpbmZvL2xpbnV4LWYyZnMtZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752646Ab3FJAkE (ORCPT ); Sun, 9 Jun 2013 20:40:04 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:20360 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751504Ab3FJAkC convert rfc822-to-8bit (ORCPT ); Sun, 9 Jun 2013 20:40:02 -0400 X-AuditID: cbfee68e-b7f276d000002279-8c-51b5206092cc MIME-version: 1.0 Content-type: text/plain; charset=UTF-8 Content-transfer-encoding: 8BIT Message-id: <1370824712.22405.18.camel@lcm> Subject: Re: [f2fs-dev] [PATCH 1/4] f2fs: reorganize the f2fs_setattr() function. From: Changman Lee To: Namjae Jeon Cc: jaegeuk.kim@samsung.com, Namjae Jeon , Pankaj Kumar , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Date: Mon, 10 Jun 2013 09:38:32 +0900 In-reply-to: <1370694303-2738-1-git-send-email-linkinjeon@gmail.com> References: <1370694303-2738-1-git-send-email-linkinjeon@gmail.com> X-Mailer: Evolution 3.2.3-0ubuntu6 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrHIsWRmVeSWpSXmKPExsVy+t8zA90Eha2BBid75Cyu7/rLZHH97i1m i0uL3C327D3JYnF51xw2ix/T6y1+7DrP7MDusXPWXXaP3Qs+M3n0bVnF6PF5k1wASxSXTUpq TmZZapG+XQJXxr4d85gLPqhUTD7cy9bA+F6mi5GTQ0LARGLJy0ssELaYxIV769m6GLk4hASW MUocWz+DGaZoWctidojEIkaJD3e7WEESvAKCEj8m3wPrZhZQl5g0bxEzhC0i0ff1EhuErS2x bOFrsLiQwGtGiY/dehC92hKfFs1m7GLk4BAWCJZoXcAJEmYT0JJoP72WBSQsIqAmMeFZKsha ZoGLjBKrP85jBKlhEVCVaHj+kh3E5hRwkXjT9IwdYryzxMbPd9ghblaS2N3eCXazhMApdom9 0yczQzQLSHybfAhsgYSArMSmA1A/SkocXHGDZQKj+Cwkn81C8tksJJ/NQvLZAkaWVYyiqQXJ BcVJ6UVGesWJucWleel6yfm5mxghcdm3g/HmAetDjMlA6ycyS4km5wPjOq8k3tDYzMjC1MTU 2Mjc0ow0YSVxXrUW60AhgfTEktTs1NSC1KL4otKc1OJDjEwcnFINjCos9mcllWQMHELenecM f/PyyCNfLZ9Z2Yf+1iiuNY7S4fup1crwzEXQ9I3vvNNCb7J+xJzf/qK248mT6tyHXJMm7eUq ZwmV32V3ZZorF2/ct4KWr42qt57eWXyS5drHbx2cwQ81xaoYqh7lv5hpe8ZAyeXp+e7veVKV UVI39bybHO7tnJFtp8RSnJFoqMVcVJwIAK4xl7jhAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIKsWRmVeSWpSXmKPExsVy+t9jAd0Eha2BBr9eSVhc3/WXyeL63VvM FpcWuVvs2XuSxeLyrjlsFj+m11v82HWe2YHdY+esu+weuxd8ZvLo27KK0ePzJrkAlqgGRpuM 1MSU1CKF1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wcoAOUFMoSc0qB QgGJxcVK+naYJoSGuOlawDRG6PqGBMH1GBmggYR1jBlPfp9lL9ijUnH80TmmBsbdMl2MnBwS AiYSy1oWs0PYYhIX7q1n62Lk4hASWMQo8eFuFytIgldAUOLH5HssXYwcHMwC8hJHLmWDhJkF 1CUmzVvEDGILCbxmlPjYrQdRri3xadFsRpByYYFgidYFnCBhNgEtifbTa8GmiAioSUx4lgqy iVngIqPE6o/zGEFqWARUJRqevwQ7h1PAReJN0zN2iPHOEhs/34E6U0lid3sn+wRGgVlIjpuF cNwsJMctYGRexSiaWpBcUJyUnmukV5yYW1yal66XnJ+7iREcwc+kdzCuarA4xCjAwajEw/vg 15ZAIdbEsuLK3EOMEhzMSiK8BU1AId6UxMqq1KL8+KLSnNTiQ4zJQMdOZJYSTc4HJpe8knhD YxMzI0sjMwsjE3Nz0oSVxHkPtloHCgmkJ5akZqemFqQWwWxh4uCUamBcpVpb5HDZRL3cf8HJ uVZb32hJR5R+XP5j59Ilek9XCgvHr27Q/yMpbSUh8iFb2b1w3/QvoRqJbBtedh2efSj5etrK VP7iKb8jTu5bp95f379yQ/LuF1PeNR9itTR9YvRu8yGm0vMpuXblJz72XJb9qhW9Nn12aUdC j+IBds6iK4WlnNP5zsopsRRnJBpqMRcVJwIAraWwOyQDAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello, Namjae If using ACL, whenever i_mode is changed we should update acl_mode which is written to xattr block, too. And vice versa. Because update_inode() is called at any reason and anytime, so we should sync both the moment xattr is written. We don't hope that only i_mode is written to disk and xattr is not. So f2fs_setattr is dirty. And, below code has a bug. When error is occurred, inode->i_mode shouldn't be changed. Please, check one more time, Namjae. diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index deefd25..29cd449 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -352,10 +352,8 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr) if (attr->ia_valid & ATTR_MODE) { err = f2fs_acl_chmod(inode); - if (err || is_inode_flag_set(fi, FI_ACL_MODE)) { - inode->i_mode = fi->i_acl_mode; + if (err || is_inode_flag_set(fi, FI_ACL_MODE)) clear_inode_flag(fi, FI_ACL_MODE); - } } Thanks. On 토, 2013-06-08 at 21:25 +0900, Namjae Jeon wrote: > From: Namjae Jeon > > Remove the redundant code from this function and make it aligned with > usages of latest generic vfs layer function e.g using the setattr_copy() > instead of using the f2fs specific function. > > Also correct the condition for updating the size of file via > truncate_setsize(). > > Signed-off-by: Namjae Jeon > Signed-off-by: Pankaj Kumar > --- > fs/f2fs/acl.c | 5 +---- > fs/f2fs/file.c | 47 +++++------------------------------------------ > 2 files changed, 6 insertions(+), 46 deletions(-) > > diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c > index 44abc2f..2d13f44 100644 > --- a/fs/f2fs/acl.c > +++ b/fs/f2fs/acl.c > @@ -17,9 +17,6 @@ > #include "xattr.h" > #include "acl.h" > > -#define get_inode_mode(i) ((is_inode_flag_set(F2FS_I(i), FI_ACL_MODE)) ? \ > - (F2FS_I(i)->i_acl_mode) : ((i)->i_mode)) > - > static inline size_t f2fs_acl_size(int count) > { > if (count <= 4) { > @@ -299,7 +296,7 @@ int f2fs_acl_chmod(struct inode *inode) > struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); > struct posix_acl *acl; > int error; > - umode_t mode = get_inode_mode(inode); > + umode_t mode = inode->i_mode; > > if (!test_opt(sbi, POSIX_ACL)) > return 0; > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index deefd25..8dfc1da 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -300,63 +300,26 @@ static int f2fs_getattr(struct vfsmount *mnt, > return 0; > } > > -#ifdef CONFIG_F2FS_FS_POSIX_ACL > -static void __setattr_copy(struct inode *inode, const struct iattr *attr) > -{ > - struct f2fs_inode_info *fi = F2FS_I(inode); > - unsigned int ia_valid = attr->ia_valid; > - > - if (ia_valid & ATTR_UID) > - inode->i_uid = attr->ia_uid; > - if (ia_valid & ATTR_GID) > - inode->i_gid = attr->ia_gid; > - if (ia_valid & ATTR_ATIME) > - inode->i_atime = timespec_trunc(attr->ia_atime, > - inode->i_sb->s_time_gran); > - if (ia_valid & ATTR_MTIME) > - inode->i_mtime = timespec_trunc(attr->ia_mtime, > - inode->i_sb->s_time_gran); > - if (ia_valid & ATTR_CTIME) > - inode->i_ctime = timespec_trunc(attr->ia_ctime, > - inode->i_sb->s_time_gran); > - if (ia_valid & ATTR_MODE) { > - umode_t mode = attr->ia_mode; > - > - if (!in_group_p(inode->i_gid) && !capable(CAP_FSETID)) > - mode &= ~S_ISGID; > - set_acl_inode(fi, mode); > - } > -} > -#else > -#define __setattr_copy setattr_copy > -#endif > - > int f2fs_setattr(struct dentry *dentry, struct iattr *attr) > { > struct inode *inode = dentry->d_inode; > - struct f2fs_inode_info *fi = F2FS_I(inode); > int err; > > err = inode_change_ok(inode, attr); > if (err) > return err; > > - if ((attr->ia_valid & ATTR_SIZE) && > - attr->ia_size != i_size_read(inode)) { > - truncate_setsize(inode, attr->ia_size); > + if ((attr->ia_valid & ATTR_SIZE)) { > + if (attr->ia_size != i_size_read(inode)) > + truncate_setsize(inode, attr->ia_size); > f2fs_truncate(inode); > f2fs_balance_fs(F2FS_SB(inode->i_sb)); > } > > - __setattr_copy(inode, attr); > + setattr_copy(inode, attr); > > - if (attr->ia_valid & ATTR_MODE) { > + if (attr->ia_valid & ATTR_MODE) > err = f2fs_acl_chmod(inode); > - if (err || is_inode_flag_set(fi, FI_ACL_MODE)) { > - inode->i_mode = fi->i_acl_mode; > - clear_inode_flag(fi, FI_ACL_MODE); > - } > - } > > mark_inode_dirty(inode); > return err;