From mboxrd@z Thu Jan 1 00:00:00 1970 From: majianpeng Subject: [PATCH] ceph: avoid meaningless calling ceph_caps_revoking if sync_mode == WB_SYNC_ALL. Date: Wed, 19 Jun 2013 15:12:06 +0800 Message-ID: <201306191512024406391@gmail.com> Reply-To: majianpeng Mime-Version: 1.0 Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pa0-f54.google.com ([209.85.220.54]:50518 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756393Ab3FSHMK (ORCPT ); Wed, 19 Jun 2013 03:12:10 -0400 Sender: ceph-devel-owner@vger.kernel.org List-ID: To: sage Cc: ceph-devel , linux-kernel U2lnbmVkLW9mZi1ieTogSmlhbnBlbmcgTWEgPG1hamlhbnBlbmdAZ21haWwuY29tPg0KLS0tDQog ZnMvY2VwaC9hZGRyLmMgfCA0ICsrLS0NCiAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCsp LCAyIGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvZnMvY2VwaC9hZGRyLmMgYi9mcy9jZXBo L2FkZHIuYw0KaW5kZXggM2U2OGFjMS4uMjVmYThiOCAxMDA2NDQNCi0tLSBhL2ZzL2NlcGgvYWRk ci5jDQorKysgYi9mcy9jZXBoL2FkZHIuYw0KQEAgLTY3Nyw4ICs2NzcsOCBAQCBzdGF0aWMgaW50 IGNlcGhfd3JpdGVwYWdlc19zdGFydChzdHJ1Y3QgYWRkcmVzc19zcGFjZSAqbWFwcGluZywNCiAJ ICogaW50ZWdyaXR5IHdyaXRlIChlLmcuLCBPX1NZTkMgd3JpdGUgb3IgZnN5bmMoKSksIG9yIGlm IG91cg0KIAkgKiBjYXAgaXMgYmVpbmcgcmV2b2tlZC4NCiAJICovDQotCWRvX3N5bmMgPSB3YmMt PnN5bmNfbW9kZSA9PSBXQl9TWU5DX0FMTDsNCi0JaWYgKGNlcGhfY2Fwc19yZXZva2luZyhjaSwg Q0VQSF9DQVBfRklMRV9CVUZGRVIpKQ0KKwlpZiAoKHdiYy0+c3luY19tb2RlID09IFdCX1NZTkNf QUxMKSB8fA0KKwkJY2VwaF9jYXBzX3Jldm9raW5nKGNpLCBDRVBIX0NBUF9GSUxFX0JVRkZFUikp DQogCQlkb19zeW5jID0gMTsNCiAJZG91dCgid3JpdGVwYWdlc19zdGFydCAlcCBkb3N5bmM9JWQg KG1vZGU9JXMpXG4iLA0KIAkgICAgIGlub2RlLCBkb19zeW5jLA0KLS0gDQoxLjguMy5yYzEuNDQu Z2IzODdjNzcNCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756567Ab3FSHMM (ORCPT ); Wed, 19 Jun 2013 03:12:12 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:50518 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756393Ab3FSHMK (ORCPT ); Wed, 19 Jun 2013 03:12:10 -0400 Date: Wed, 19 Jun 2013 15:12:06 +0800 From: majianpeng To: sage Cc: ceph-devel , linux-kernel Reply-To: majianpeng Subject: [PATCH] ceph: avoid meaningless calling ceph_caps_revoking if sync_mode == WB_SYNC_ALL. X-Priority: 3 X-GUID: 7B38E144-81EF-413B-B8C7-D2BD0DC4372A X-Has-Attach: no X-Mailer: Foxmail 7.0.1.90[en] Mime-Version: 1.0 Message-ID: <201306191512024406391@gmail.com> Content-Type: text/plain; charset="gb2312" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id r5J7CKWh006513 Signed-off-by: Jianpeng Ma --- fs/ceph/addr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 3e68ac1..25fa8b8 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -677,8 +677,8 @@ static int ceph_writepages_start(struct address_space *mapping, * integrity write (e.g., O_SYNC write or fsync()), or if our * cap is being revoked. */ - do_sync = wbc->sync_mode == WB_SYNC_ALL; - if (ceph_caps_revoking(ci, CEPH_CAP_FILE_BUFFER)) + if ((wbc->sync_mode == WB_SYNC_ALL) || + ceph_caps_revoking(ci, CEPH_CAP_FILE_BUFFER)) do_sync = 1; dout("writepages_start %p dosync=%d (mode=%s)\n", inode, do_sync, -- 1.8.3.rc1.44.gb387c77 {.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I