diff options
| author | Sage Weil <sage@inktank.com> | 2013-02-26 17:29:48 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-02-26 17:29:48 -0800 |
| commit | d6b4a7be209a9c4dc5bfb4eb5fbae947b6983276 (patch) | |
| tree | 12dbc5fc3357b98eab78038f698277585b18ad84 | |
| parent | 0666b630b7c5c9f64709db8c5b3a3b39541b1b7a (diff) | |
| parent | f58601d681d3aee6541119ab830ba5e2a9ec3a13 (diff) | |
| download | ceph-d6b4a7be209a9c4dc5bfb4eb5fbae947b6983276.tar.gz | |
Merge branch 'next'
| -rw-r--r-- | src/librbd/internal.cc | 2 | ||||
| -rw-r--r-- | src/msg/msg_types.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index 9c8276fd4fd..df73a94050a 100644 --- a/src/librbd/internal.cc +++ b/src/librbd/internal.cc @@ -1752,7 +1752,7 @@ reprotect_and_return_err: lderr(cct) << "No such snapshot found." << dendl; return -ENOENT; } - new_size = ictx->get_image_size(ictx->snap_id); + new_size = ictx->get_image_size(snap_id); } // need to flush any pending writes before resizing and rolling back - diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h index e80639ead0b..40b3f0bfedc 100644 --- a/src/msg/msg_types.h +++ b/src/msg/msg_types.h @@ -303,7 +303,7 @@ struct entity_addr_t { if (addr.ss_family == AF_INET6) return memcmp(addr6.sin6_addr.s6_addr, o.addr6.sin6_addr.s6_addr, - sizeof(addr6.sin6_addr.s6_addr)); + sizeof(addr6.sin6_addr.s6_addr)) == 0; return false; } |