From 239c0a126b2c22621187f205df0b8498b3ffa59f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 12 Nov 2010 08:30:05 -0800 Subject: [PATCH] rbd: fix version renaming Signed-off-by: Sage Weil --- src/rbd.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/rbd.cc b/src/rbd.cc index 2c8ebd3707b4c..229c0739b5d19 100644 --- a/src/rbd.cc +++ b/src/rbd.cc @@ -254,7 +254,7 @@ static int read_header_bl(pool_t pool, string& md_oid, bufferlist& header, uint6 } while (r == READ_SIZE); if (ver) - *ver = rados.get_last_ver(pool); + *ver = rados.get_last_version(pool); return 0; } @@ -265,8 +265,9 @@ static int notify_change(pool_t pool, string& oid, uint64_t *pver) if (pver) ver = *pver; else - ver = rados.get_last_ver(pool); + ver = rados.get_last_version(pool); rados.notify(pool, oid, ver); + return 0; } static int read_header(pool_t pool, string& md_oid, struct rbd_obj_header_ondisk *header, uint64_t *ver) @@ -505,7 +506,7 @@ static int do_resize(pools_t& pp, string& md_oid, const char *imgname, uint64_t // rewrite header bufferlist bl; bl.append((const char *)&header, sizeof(header)); - rados.set_assert_ver(pp.md, ver); + rados.set_assert_version(pp.md, ver); r = rados.write(pp.md, md_oid, 0, bl, bl.length()); if (r == -ERANGE) cerr << "operation might have conflicted with another client!" << std::endl; -- 2.39.5