From 2ca1809cfc39a97dac29282c83472720c9979b97 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 20 Aug 2008 16:58:53 -0700 Subject: [PATCH] client: small queue_cap_snap cleanup --- src/client/Client.cc | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index dc7685bda0ba5..e43f6c9d17115 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -1505,9 +1505,6 @@ void Client::queue_cap_snap(Inode *in, snapid_t seq) { int used = in->caps_used(); - if (!seq) - seq = in->snaprealm->cached_snap_context.seq; - if (in->cap_snap_pending) { dout(10) << "queue_cap_snap already cap_snap_pending on " << *in << dendl; } else if (used & CEPH_CAP_WR) { @@ -1814,7 +1811,7 @@ inodeno_t Client::update_snap_trace(bufferlist& bl, bool flush) while (!p.end()) { Inode *in = *p; ++p; - queue_cap_snap(in); + queue_cap_snap(in, realm->cached_snap_context.seq); } for (set::iterator p = realm->pchildren.begin(); @@ -1889,13 +1886,11 @@ void Client::handle_snap(MClientSnap *m) dout(10) << " moving " << *in << " from " << *in->snaprealm << dendl; // queue for snap writeback - queue_cap_snap(in); + queue_cap_snap(in, in->snaprealm->cached_snap_context.seq); - if (in->snaprealm) { - put_snap_realm(in->snaprealm); - in->snaprealm_item.remove_myself(); - to_move.push_back(in); - } + put_snap_realm(in->snaprealm); + in->snaprealm_item.remove_myself(); + to_move.push_back(in); } } -- 2.39.5