diff options
| author | Sage Weil <sage.weil@dreamhost.com> | 2012-04-08 20:59:33 -0700 |
|---|---|---|
| committer | Sage Weil <sage.weil@dreamhost.com> | 2012-04-08 20:59:33 -0700 |
| commit | 7951d7e4421b35849a7ca30d11c4c0e200a6ebf5 (patch) | |
| tree | 68b94f13109f68398582ddfa6eb9d4c7d4ccddad | |
| parent | dd8fd1688a358758d5c9c605ddb1e87aedf2ade4 (diff) | |
| parent | 9832696864300afb81d51e153a6f45169fbff099 (diff) | |
| download | ceph-7951d7e4421b35849a7ca30d11c4c0e200a6ebf5.tar.gz | |
Merge remote branch 'gh/stable' into next
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | src/include/encoding.h | 6 | ||||
| -rw-r--r-- | src/os/FileStore.cc | 4 |
4 files changed, 12 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 595c4fde259..001edea87fa 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ AC_PREREQ(2.59) # NOTE: This version is _only_ used for naming the tarball. The # VERSION define is not used by the code. It gets a version string # from 'git describe'; see src/ceph_ver.[ch] -AC_INIT([ceph], [0.44.1], [ceph-devel@vger.kernel.org]) +AC_INIT([ceph], [0.44.2], [ceph-devel@vger.kernel.org]) AC_CONFIG_SUBDIRS([src/gtest]) AC_CONFIG_SUBDIRS([src/leveldb]) diff --git a/debian/changelog b/debian/changelog index 6a37ddb4854..583d9451847 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ceph (0.44.2-1) experimental; urgency=low + + * New upstream release + + -- Sage Weil <sage@newdream.net> Thu, 05 Apr 2012 14:54:17 -0700 + ceph (0.44.1-1) experimental; urgency=low * New upstream release diff --git a/src/include/encoding.h b/src/include/encoding.h index fa1cebeec48..e9bf1e92601 100644 --- a/src/include/encoding.h +++ b/src/include/encoding.h @@ -656,7 +656,7 @@ inline void decode(std::deque<T>& ls, bufferlist::iterator& p) ::encode(struct_v, bl); \ ::encode(struct_compat, bl); \ __le32 struct_len = 0; \ - unsigned struct_len_pos = bl.length(); \ + buffer::list::iterator struct_len_it = bl.end(); \ ::encode(struct_len, bl); \ do { @@ -667,8 +667,8 @@ inline void decode(std::deque<T>& ls, bufferlist::iterator& p) */ #define ENCODE_FINISH(bl) \ } while (false); \ - struct_len = bl.length() - struct_len_pos - sizeof(struct_len); \ - bl.copy_in(struct_len_pos, 4, (char *)&struct_len); + struct_len = bl.length() - struct_len_it.get_off() - sizeof(struct_len); \ + struct_len_it.copy_in(4, (char *)&struct_len); #define DECODE_ERR_VERSION(func, v) \ "" #func " unknown encoding version > " #v diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index 83832cd3dbf..46237fa1088 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -1912,7 +1912,7 @@ int FileStore::mount() { stringstream err2; - if (!object_map->check(err2)) { + if (g_conf->filestore_debug_omap_check && !object_map->check(err2)) { derr << err2.str() << dendl;; ret = -EINVAL; goto close_current_fd; @@ -3452,7 +3452,7 @@ void FileStore::sync_entry() assert(0); } stringstream errstream; - if (!object_map->check(errstream)) { + if (g_conf->filestore_debug_omap_check && !object_map->check(errstream)) { derr << errstream.str() << dendl; assert(0); } |