From: Danny Al-Gaaf Date: Fri, 1 Mar 2013 11:11:01 +0000 (+0100) Subject: mds/Locker.cc: reduce scope of 'pool' in Locker::issue_client_lease() X-Git-Tag: v0.59~54^2~43 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82f233b574007d62451fd7bd1263d3188eae4f4e;p=ceph.git mds/Locker.cc: reduce scope of 'pool' in Locker::issue_client_lease() Signed-off-by: Danny Al-Gaaf --- diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index 38fa208b9d57..712fb022866e 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -2982,13 +2982,12 @@ void Locker::handle_client_lease(MClientLease *m) void Locker::issue_client_lease(CDentry *dn, client_t client, bufferlist &bl, utime_t now, Session *session) { - int pool = 1; // fixme.. do something smart! - CInode *diri = dn->get_dir()->get_inode(); if (!diri->is_stray() && // do not issue dn leases in stray dir! ((!diri->filelock.can_lease(client) && (diri->get_client_cap_pending(client) & (CEPH_CAP_FILE_SHARED | CEPH_CAP_FILE_EXCL)) == 0)) && dn->lock.can_lease(client)) { + int pool = 1; // fixme.. do something smart! // issue a dentry lease ClientLease *l = dn->add_client_lease(client, session); session->touch_lease(l);