aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-09-07 15:59:27 -0700
committerSage Weil <sage@newdream.net>2010-09-11 10:52:47 -0700
commit3612abbd5df6baa9ca3e0777c6c8646e202d3f66 (patch)
tree6c4512ac7acf0ac12683ab330c600eef69346fe7
parent3d4401d9d0aef5c40706350685ddea3df6708496 (diff)
downloadmrst-s0i3-test-3612abbd5df6baa9ca3e0777c6c8646e202d3f66.tar.gz
mrst-s0i3-test-3612abbd5df6baa9ca3e0777c6c8646e202d3f66.tar.xz
mrst-s0i3-test-3612abbd5df6baa9ca3e0777c6c8646e202d3f66.zip
ceph: fix reconnect encoding for old servers
Fix the reconnect encoding to encode the cap record when the MDS does not have the FLOCK capability (i.e., pre v0.22). Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r--fs/ceph/mds_client.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index f091b135178..fad95f8f260 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -2374,6 +2374,8 @@ static int encode_caps_cb(struct inode *inode, struct ceph_cap *cap,
num_fcntl_locks,
num_flock_locks);
unlock_kernel();
+ } else {
+ err = ceph_pagelist_append(pagelist, &rec, reclen);
}
out_free: