Project

General

Profile

Download (735 Bytes)

Bug #6504 » patch-src-os-FileStore.cc

Alan Somers, 10/10/2013 09:05 AM

 
--- src/os/FileStore.cc.orig 2013-10-10 15:41:34.000000000 +0000
+++ src/os/FileStore.cc 2013-10-10 15:44:30.000000000 +0000
@@ -2595,8 +2595,10 @@
if (r < 0)
goto done;
- if (fiemap->fm_mapped_extents == 0)
+ if (fiemap->fm_mapped_extents == 0) {
+ free(fiemap);
goto done;
+ }
struct fiemap_extent *extent = &fiemap->fm_extents[0];
@@ -2631,6 +2633,7 @@
extent++;
}
}
+ free(fiemap);
done:
if (r >= 0) {
@@ -2639,7 +2642,6 @@
}
dout(10) << "fiemap " << cid << "/" << oid << " " << offset << "~" << len << " = " << r << " num_extents=" << exomap.size() << " " << exomap << dendl;
- free(fiemap);
assert(!m_filestore_fail_eio || r != -EIO);
return r;
}
(2-2/2)