From mboxrd@z Thu Jan 1 00:00:00 1970 From: majianpeng Subject: [PATCH 1/3] mds: update atime if client can read. Date: Tue, 2 Jul 2013 13:45:12 +0800 Message-ID: <201307021345090019137@gmail.com> Reply-To: majianpeng Mime-Version: 1.0 Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: base64 Return-path: Sender: linux-kernel-owner@vger.kernel.org To: sage Cc: ceph-devel , linux-kernel List-Id: ceph-devel.vger.kernel.org Tm93LCB1cGRhdGUgYXRpbWUgb25seSBmb3IgQ0VQSF9DQVBfRklMRV9FWENMLkNoYW5nZSB0aGlz IGlmDQpDRVBIX0NBUF9GSUxFX1JELg0KDQpTaWduZWQtb2ZmLWJ5OiBKaWFucGVuZyBNYSA8bWFq aWFucGVuZ0BnbWFpbC5jb20+DQotLS0NCiBzcmMvbWRzL0xvY2tlci5jYyB8IDE1ICsrKysrKysr Ky0tLS0tLQ0KIDEgZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0p DQoNCmRpZmYgLS1naXQgYS9zcmMvbWRzL0xvY2tlci5jYyBiL3NyYy9tZHMvTG9ja2VyLmNjDQpp bmRleCAzMGUwMTRhLi41OGY5NTNmIDEwMDY0NA0KLS0tIGEvc3JjL21kcy9Mb2NrZXIuY2MNCisr KyBiL3NyYy9tZHMvTG9ja2VyLmNjDQpAQCAtMjY3Niw4ICsyNjc2LDkgQEAgdm9pZCBMb2NrZXI6 Ol9kb19zbmFwX3VwZGF0ZShDSW5vZGUgKmluLCBzbmFwaWRfdCBzbmFwLCBpbnQgZGlydHksIHNu YXBpZF90IGZvbGwNCiB2b2lkIExvY2tlcjo6X3VwZGF0ZV9jYXBfZmllbGRzKENJbm9kZSAqaW4s IGludCBkaXJ0eSwgTUNsaWVudENhcHMgKm0sIGlub2RlX3QgKnBpKQ0KIHsNCiAgIC8vIGZpbGUN CisgIHV0aW1lX3QgYXRpbWUgPSBtLT5nZXRfYXRpbWUoKTsNCisNCiAgIGlmIChkaXJ0eSAmIChD RVBIX0NBUF9GSUxFX0VYQ0x8Q0VQSF9DQVBfRklMRV9XUikpIHsNCi0gICAgdXRpbWVfdCBhdGlt ZSA9IG0tPmdldF9hdGltZSgpOw0KICAgICB1dGltZV90IG10aW1lID0gbS0+Z2V0X210aW1lKCk7 DQogICAgIHV0aW1lX3QgY3RpbWUgPSBtLT5nZXRfY3RpbWUoKTsNCiAgICAgdWludDY0X3Qgc2l6 ZSA9IG0tPmdldF9zaXplKCk7DQpAQCAtMjcwMCwxMSArMjcwMSw3IEBAIHZvaWQgTG9ja2VyOjpf dXBkYXRlX2NhcF9maWVsZHMoQ0lub2RlICppbiwgaW50IGRpcnR5LCBNQ2xpZW50Q2FwcyAqbSwg aW5vZGVfdCAqDQogICAgICAgcGktPnNpemUgPSBzaXplOw0KICAgICAgIHBpLT5yc3RhdC5yYnl0 ZXMgPSBzaXplOw0KICAgICB9DQotICAgIGlmICgoZGlydHkgJiBDRVBIX0NBUF9GSUxFX0VYQ0wp ICYmIGF0aW1lICE9IHBpLT5hdGltZSkgew0KLSAgICAgIGRvdXQoNykgPDwgIiAgYXRpbWUgIiA8 PCBwaS0+YXRpbWUgPDwgIiAtPiAiIDw8IGF0aW1lDQotCSAgICAgIDw8ICIgZm9yICIgPDwgKmlu IDw8IGRlbmRsOw0KLSAgICAgIHBpLT5hdGltZSA9IGF0aW1lOw0KLSAgICB9DQorICAgIA0KICAg ICBpZiAoKGRpcnR5ICYgQ0VQSF9DQVBfRklMRV9FWENMKSAmJg0KIAljZXBoX3NlcV9jbXAocGkt PnRpbWVfd2FycF9zZXEsIG0tPmdldF90aW1lX3dhcnBfc2VxKCkpIDwgMCkgew0KICAgICAgIGRv dXQoNykgPDwgIiAgdGltZV93YXJwX3NlcSAiIDw8IHBpLT50aW1lX3dhcnBfc2VxIDw8ICIgLT4g IiA8PCBtLT5nZXRfdGltZV93YXJwX3NlcSgpDQpAQCAtMjcxMiw2ICsyNzA5LDEyIEBAIHZvaWQg TG9ja2VyOjpfdXBkYXRlX2NhcF9maWVsZHMoQ0lub2RlICppbiwgaW50IGRpcnR5LCBNQ2xpZW50 Q2FwcyAqbSwgaW5vZGVfdCAqDQogICAgICAgcGktPnRpbWVfd2FycF9zZXEgPSBtLT5nZXRfdGlt ZV93YXJwX3NlcSgpOw0KICAgICB9DQogICB9DQorICANCisgIGlmICgoZGlydHkgJiBDRVBIX0NB UF9GSUxFX1JEKSAmJiBhdGltZSA+IHBpLT5hdGltZSkgew0KKyAgICAgIGRvdXQoNykgPDwgIiAg YXRpbWUgIiA8PCBwaS0+YXRpbWUgPDwgIiAtPiAiIDw8IGF0aW1lDQorCSAgICAgIDw8ICIgZm9y ICIgPDwgKmluIDw8IGRlbmRsOw0KKyAgICAgIHBpLT5hdGltZSA9IGF0aW1lOw0KKyAgfQ0KICAg Ly8gYXV0aA0KICAgaWYgKGRpcnR5ICYgQ0VQSF9DQVBfQVVUSF9FWENMKSB7DQogICAgIGlmICht LT5oZWFkLnVpZCAhPSBwaS0+dWlkKSB7DQotLSANCjEuOC4zLnJjMS40NC5nYjM4N2M3Nw0K From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753067Ab3GBFqW (ORCPT ); Tue, 2 Jul 2013 01:46:22 -0400 Received: from mail-pb0-f48.google.com ([209.85.160.48]:39734 "EHLO mail-pb0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752243Ab3GBFpQ (ORCPT ); Tue, 2 Jul 2013 01:45:16 -0400 Date: Tue, 2 Jul 2013 13:45:12 +0800 From: majianpeng To: sage Cc: ceph-devel , linux-kernel Reply-To: majianpeng Subject: [PATCH 1/3] mds: update atime if client can read. X-Priority: 3 X-GUID: A6A95C9D-0292-4992-AD61-5B1C1B40D9BF X-Has-Attach: no X-Mailer: Foxmail 7.0.1.90[en] Mime-Version: 1.0 Message-ID: <201307021345090019137@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 r625kXSg005648 Now, update atime only for CEPH_CAP_FILE_EXCL.Change this if CEPH_CAP_FILE_RD. Signed-off-by: Jianpeng Ma --- src/mds/Locker.cc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index 30e014a..58f953f 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -2676,8 +2676,9 @@ void Locker::_do_snap_update(CInode *in, snapid_t snap, int dirty, snapid_t foll void Locker::_update_cap_fields(CInode *in, int dirty, MClientCaps *m, inode_t *pi) { // file + utime_t atime = m->get_atime(); + if (dirty & (CEPH_CAP_FILE_EXCL|CEPH_CAP_FILE_WR)) { - utime_t atime = m->get_atime(); utime_t mtime = m->get_mtime(); utime_t ctime = m->get_ctime(); uint64_t size = m->get_size(); @@ -2700,11 +2701,7 @@ void Locker::_update_cap_fields(CInode *in, int dirty, MClientCaps *m, inode_t * pi->size = size; pi->rstat.rbytes = size; } - if ((dirty & CEPH_CAP_FILE_EXCL) && atime != pi->atime) { - dout(7) << " atime " << pi->atime << " -> " << atime - << " for " << *in << dendl; - pi->atime = atime; - } + if ((dirty & CEPH_CAP_FILE_EXCL) && ceph_seq_cmp(pi->time_warp_seq, m->get_time_warp_seq()) < 0) { dout(7) << " time_warp_seq " << pi->time_warp_seq << " -> " << m->get_time_warp_seq() @@ -2712,6 +2709,12 @@ void Locker::_update_cap_fields(CInode *in, int dirty, MClientCaps *m, inode_t * pi->time_warp_seq = m->get_time_warp_seq(); } } + + if ((dirty & CEPH_CAP_FILE_RD) && atime > pi->atime) { + dout(7) << " atime " << pi->atime << " -> " << atime + << " for " << *in << dendl; + pi->atime = atime; + } // auth if (dirty & CEPH_CAP_AUTH_EXCL) { if (m->head.uid != pi->uid) { -- 1.8.3.rc1.44.gb387c77 {.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I