From 64241497831d0b890ec22e1011586d5f5aa20fe3 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Mon, 18 Jul 2011 13:24:30 -0700 Subject: [PATCH] osd: remove unused variables Signed-off-by: Greg Farnum --- src/os/FileJournal.cc | 2 -- src/osd/OSD.cc | 5 ----- src/osd/PG.cc | 1 - src/osd/ReplicatedPG.cc | 11 ----------- 4 files changed, 19 deletions(-) diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc index 32b415eb831f0..d2ce54ba7c4cb 100644 --- a/src/os/FileJournal.cc +++ b/src/os/FileJournal.cc @@ -760,8 +760,6 @@ void FileJournal::do_write(bufferlist& bl) writing = true; - header_t old_header = header; - write_lock.Unlock(); dout(15) << "do_write writing " << write_pos << "~" << bl.length() diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index a3dabc56b9dbe..545496118a466 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1950,7 +1950,6 @@ void OSD::handle_notify_timeout(void *_notif) watch_lock.Unlock(); /* put_object_context takes osd->lock */ ReplicatedPG *pg = (ReplicatedPG *)lookup_lock_raw_pg(notif->pgid); - pg_t pgid = notif->pgid; pg->do_complete_notify(notif, obc); pg->put_object_context(obc); pg->unlock(); @@ -3312,7 +3311,6 @@ void OSD::advance_map(ObjectStore::Transaction& t) for (hash_map::iterator it = pg_map.begin(); it != pg_map.end(); it++) { - pg_t pgid = it->first; PG *pg = it->second; vector newup, newacting; @@ -4055,7 +4053,6 @@ void OSD::handle_pg_notify(MOSDPGNotify *m) for (vector::iterator it = m->get_pg_list().begin(); it != m->get_pg_list().end(); it++) { - pg_t pgid = it->pgid; PG *pg = 0; ObjectStore::Transaction *t; @@ -4878,8 +4875,6 @@ void OSD::handle_op(MOSDOp *op) // ... throttle_op_queue(); - utime_t now = ceph_clock_now(g_ceph_context); - int r = init_op_flags(op); if (r) { reply_op_error(op, r); diff --git a/src/osd/PG.cc b/src/osd/PG.cc index cb8860a7c33b6..1aaa70ff02a5b 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -594,7 +594,6 @@ bool PG::search_for_missing(const Info &oinfo, const Missing *omissing, ++p) { const sobject_t &soid(p->first); eversion_t need = p->second.need; - eversion_t have = p->second.have; if (oinfo.last_update < need) { dout(10) << "search_for_missing " << soid << " " << need << " also missing on osd" << fromosd diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 57fce2f8a3e81..df801d3777aef 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -1586,8 +1586,6 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops, case CEPH_OSD_OP_CLONERANGE: { - bufferlist::iterator p = osd_op.data.begin(); - if (!obs.exists) { t.touch(coll, obs.oi.soid); maybe_created = true; @@ -1751,7 +1749,6 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops, bufferlist::iterator ip = ibl.begin(); bufferlist obl; - bool changed = false; dout(30) << "the update command is: \n"; osd_op.data.hexdump(*_dout); @@ -1782,7 +1779,6 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops, bufferlist data; ::decode(data, bp); m[key] = data; - changed = true; } break; @@ -1794,7 +1790,6 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops, if (m.count(key)) return -EEXIST; m[key] = data; - changed = true; } break; @@ -1802,14 +1797,12 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops, ::decode(key, bp); if (m.count(key)) { m.erase(key); - changed = true; } break; case CEPH_OSD_TMAP_HDR: // update header { ::decode(header, bp); - changed = true; } break; @@ -1834,7 +1827,6 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops, if (!bp.end() && *bp == CEPH_OSD_TMAP_HDR) { ++bp; ::decode(header, bp); - changed = true; dout(10) << "tmapup new header " << header.length() << dendl; } @@ -1903,7 +1895,6 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops, } else if (op == CEPH_OSD_TMAP_RM) { // do nothing. } - changed = true; } // copy remaining @@ -2223,7 +2214,6 @@ void ReplicatedPG::write_update_size_and_usage(pg_stat_t& stats, object_info_t& uint64_t offset, uint64_t length, bool count_bytes) { if (ss.clones.size()) { - snapid_t newest = *ss.clones.rbegin(); interval_set ch; if (length) ch.insert(offset, length); @@ -3834,7 +3824,6 @@ void ReplicatedPG::sub_op_push_reply(MOSDSubOpReply *reply) void ReplicatedPG::sub_op_pull(MOSDSubOp *op) { const sobject_t soid = op->poid; - const eversion_t v = op->version; dout(7) << "op_pull " << soid << " v " << op->version << " from " << op->get_source() -- 2.39.5