summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Zafman <david.zafman@inktank.com>2013-04-04 15:51:40 -0700
committerDavid Zafman <david.zafman@inktank.com>2013-04-19 11:29:17 -0700
commit5ffb3ef4c25d9bc19460803a2924f8dbe034d50c (patch)
treee557250bfe0b966e37c096bfb836aac679bdaf62
parentaf5a9b37f26e438b828adc44ef9642be6817379d (diff)
downloadceph-5ffb3ef4c25d9bc19460803a2924f8dbe034d50c.tar.gz
filestore, osd: Fixes to comform to programming guidelines
Signed-off-by: David Zafman <david.zafman@inktank.com>
-rw-r--r--src/os/FileStore.cc3
-rw-r--r--src/osd/PG.cc6
2 files changed, 6 insertions, 3 deletions
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 5170412183e..aa6416453e0 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -198,7 +198,8 @@ int FileStore::lfn_stat(coll_t cid, const hobject_t& oid, struct stat *buf)
int FileStore::lfn_open(coll_t cid, const hobject_t& oid, int flags, mode_t mode,
IndexedPath *path,
- Index *index) {
+ Index *index)
+{
Index index2;
IndexedPath path2;
if (!path)
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index f21882966da..095e2073897 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -39,7 +39,8 @@
#define dout_subsys ceph_subsys_osd
#undef dout_prefix
#define dout_prefix _prefix(_dout, this)
-static ostream& _prefix(std::ostream *_dout, const PG *pg) {
+static ostream& _prefix(std::ostream *_dout, const PG *pg)
+{
return *_dout << pg->gen_prefix();
}
@@ -3383,7 +3384,8 @@ void PG::scrub_unreserve_replicas()
}
}
-void PG::_scan_snaps(ScrubMap &smap) {
+void PG::_scan_snaps(ScrubMap &smap)
+{
for (map<hobject_t, ScrubMap::object>::iterator i = smap.objects.begin();
i != smap.objects.end();
++i) {