ceph: fix message order check in handle_cap_export()

If caps for importer mds exists, but cap id mismatch, client should
have received corresponding import message. Because cap ID does not
change as long as client holds the caps.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 5daf86621871b921debd4e26772bca65ff8bac7d..7a79450328026e462feb449b80b90febd66c99c8 100644 (file)
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -3427,7 +3427,7 @@ retry:
        tcap = __get_cap_for_mds(ci, target);
        if (tcap) {
                /* already have caps from the target */
-               if (tcap->cap_id != t_cap_id ||
+               if (tcap->cap_id == t_cap_id &&
                    ceph_seq_cmp(tcap->seq, t_seq) < 0) {
                        dout(" updating import cap %p mds%d\n", tcap, target);
                        tcap->cap_id = t_cap_id;