libceph, rbd: ignore addr->type while comparing in some cases

For libceph, this ensures that libceph instance sharing (share option)
continues to work.  For rbd, this avoids blocklisting alive lock owners
(locker addr is always LEGACY, while watcher addr is ANY in nautilus).

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index f84128a..bec85c0 100644 (file)
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3957,8 +3957,12 @@ static int find_watcher(struct rbd_device *rbd_dev,
 
        sscanf(locker->id.cookie, RBD_LOCK_COOKIE_PREFIX " %llu", &cookie);
        for (i = 0; i < num_watchers; i++) {
-               if (!memcmp(&watchers[i].addr, &locker->info.addr,
-                           sizeof(locker->info.addr)) &&
+               /*
+                * Ignore addr->type while comparing.  This mimics
+                * entity_addr_t::get_legacy_str() + strcmp().
+                */
+               if (ceph_addr_equal_no_type(&watchers[i].addr,
+                                           &locker->info.addr) &&
                    watchers[i].cookie == cookie) {
                        struct rbd_client_id cid = {
                                .gid = le64_to_cpu(watchers[i].name.num),

diff --git a/include/linux/ceph/msgr.h b/include/linux/ceph/msgr.h
index 4693948..9a897a6 100644 (file)
--- a/include/linux/ceph/msgr.h
+++ b/include/linux/ceph/msgr.h
@@ -52,11 +52,18 @@ extern const char *ceph_entity_type_name(int type);
  * entity_addr -- network address
  */
 struct ceph_entity_addr {
-       __le32 type;
+       __le32 type;  /* CEPH_ENTITY_ADDR_TYPE_* */
        __le32 nonce;  /* unique id for process (e.g. pid) */
        struct sockaddr_storage in_addr;
 } __attribute__ ((packed));
 
+static inline bool ceph_addr_equal_no_type(const struct ceph_entity_addr *lhs,
+                                          const struct ceph_entity_addr *rhs)
+{
+       return !memcmp(&lhs->in_addr, &rhs->in_addr, sizeof(lhs->in_addr)) &&
+              lhs->nonce == rhs->nonce;
+}
+
 struct ceph_entity_inst {
        struct ceph_entity_name name;
        struct ceph_entity_addr addr;

diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index a9754a7..f5f090b 100644 (file)
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -161,9 +161,11 @@ int ceph_monmap_contains(struct ceph_monmap *m, struct ceph_entity_addr *addr)
 {
        int i;
 
-       for (i = 0; i < m->num_mon; i++)
-               if (memcmp(addr, &m->mon_inst[i].addr, sizeof(*addr)) == 0)
+       for (i = 0; i < m->num_mon; i++) {
+               if (ceph_addr_equal_no_type(addr, &m->mon_inst[i].addr))
                        return 1;
+       }
+
        return 0;
 }