ceph: fix decode_locker to use ceph_decode_entity_addr

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/net/ceph/cls_lock_client.c b/net/ceph/cls_lock_client.c
index 4cc2854..b1d12bf 100644 (file)
--- a/net/ceph/cls_lock_client.c
+++ b/net/ceph/cls_lock_client.c
@@ -264,8 +264,11 @@ static int decode_locker(void **p, void *end, struct ceph_locker *locker)
                return ret;
 
        *p += sizeof(struct ceph_timespec); /* skip expiration */
-       ceph_decode_copy(p, &locker->info.addr, sizeof(locker->info.addr));
-       ceph_decode_addr(&locker->info.addr);
+
+       ret = ceph_decode_entity_addr(p, end, &locker->info.addr);
+       if (ret)
+               return ret;
+
        len = ceph_decode_32(p);
        *p += len; /* skip description */