From 48f56a5fe17ecedb512d2dbe321d891441f9a7f0 Mon Sep 17 00:00:00 2001 From: huanwen ren Date: Fri, 8 Jul 2016 15:54:36 +0800 Subject: [PATCH] osdc/mds: fixup pos parameter in the journaler the type of write_pos\read_pos\expire_pos\trimming_pos is uint64_t, change the "pos parameter" to uint64_t Signed-off-by: huanwen ren --- src/osdc/Journaler.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osdc/Journaler.h b/src/osdc/Journaler.h index c37cfce48975..b1983bbc1e5c 100644 --- a/src/osdc/Journaler.h +++ b/src/osdc/Journaler.h @@ -456,11 +456,11 @@ public: void set_layout(file_layout_t const *l); void set_readonly(); void set_writeable(); - void set_write_pos(int64_t p) { + void set_write_pos(uint64_t p) { lock_guard l(lock); prezeroing_pos = prezero_pos = write_pos = flush_pos = safe_pos = p; } - void set_read_pos(int64_t p) { + void set_read_pos(uint64_t p) { lock_guard l(lock); // we can't cope w/ in-progress read right now. assert(requested_pos == received_pos); @@ -468,11 +468,11 @@ public: read_buf.clear(); } uint64_t append_entry(bufferlist& bl); - void set_expire_pos(int64_t ep) { + void set_expire_pos(uint64_t ep) { lock_guard l(lock); expire_pos = ep; } - void set_trimmed_pos(int64_t p) { + void set_trimmed_pos(uint64_t p) { lock_guard l(lock); trimming_pos = trimmed_pos = p; } -- 2.47.3