From 6111985a60f84621d2e00cfdda840e3d75b80ba3 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 22 Sep 2010 11:16:00 -0700 Subject: [PATCH] --- yaml --- r: 211391 b: refs/heads/master c: d91f2438d881514e4a923fd786dbd94b764a9440 h: refs/heads/master i: 211389: c561c2ffc89258486ba0f217e0fad7f6dc7972d7 211387: e5e19b58641739c907c093e66cebe3dbc6d9a4f7 211383: 61cd3688e12fae506e32e560b62e24599f3bca75 211375: dee4210906c33ed8310f890ec5759986694fa117 211359: c3378458573ccc35782ffc85660cd56ad5ed839b 211327: 4564a1d900dab4540ef3f525bf66392455dca5a5 v: v3 --- [refs] | 2 +- trunk/fs/ceph/caps.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 267d59521ff5..dc84a74b0c0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21b559de56695d36b3f0819b7e2454737db254f8 +refs/heads/master: d91f2438d881514e4a923fd786dbd94b764a9440 diff --git a/trunk/fs/ceph/caps.c b/trunk/fs/ceph/caps.c index 97de325a49f8..5e9da996a151 100644 --- a/trunk/fs/ceph/caps.c +++ b/trunk/fs/ceph/caps.c @@ -2283,7 +2283,8 @@ static void handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant, { struct ceph_inode_info *ci = ceph_inode(inode); int mds = session->s_mds; - int seq = le32_to_cpu(grant->seq); + unsigned seq = le32_to_cpu(grant->seq); + unsigned issue_seq = le32_to_cpu(grant->issue_seq); int newcaps = le32_to_cpu(grant->caps); int issued, implemented, used, wanted, dirty; u64 size = le64_to_cpu(grant->size); @@ -2295,8 +2296,8 @@ static void handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant, int revoked_rdcache = 0; int queue_invalidate = 0; - dout("handle_cap_grant inode %p cap %p mds%d seq %d %s\n", - inode, cap, mds, seq, ceph_cap_string(newcaps)); + dout("handle_cap_grant inode %p cap %p mds%d seq %u/%u %s\n", + inode, cap, mds, seq, issue_seq, ceph_cap_string(newcaps)); dout(" size %llu max_size %llu, i_size %llu\n", size, max_size, inode->i_size); @@ -2392,6 +2393,7 @@ static void handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant, } cap->seq = seq; + cap->issue_seq = issue_seq; /* file layout may have changed */ ci->i_layout = grant->layout;