RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 08:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Sage Weil 2012-04-06 12:26:12 -07:00
commit 2ceda94677
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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])

6
debian/changelog vendored
View File

@ -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

6
src/include/encoding.h
View File

@ -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

4
src/os/FileStore.cc
View File

@ -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);
}