RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 17:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

mds: set old and new dentry lease bits

Browse Source 
Recent kernels got the new CEPH_LOCK_DN definition but we were still
setting the old bit.  Set both so we work with both classes of clients. In
the meantime, update the kernel to ignore this field so that eventually we
can drop/reuse it.

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2011-07-07 13:35:32 -07:00
parent 616ff50264
commit 5dc09dd6b8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mds/Locker.cc
View File

@ -2774,7 +2774,7 @@ void Locker::issue_client_lease(CDentry *dn, client_t client,
mdcache->touch_client_lease(l, pool, now);
LeaseStat e;
e.mask = 1;
e.mask = 1 | CEPH_LOCK_DN; // old and new bit values
e.seq = ++l->seq;
e.duration_ms = (int)(1000 * mdcache->client_lease_durations[pool]);
::encode(e, bl);
@ -2805,7 +2805,7 @@ void Locker::revoke_client_leases(SimpleLock *lock)
assert(lock->get_type() == CEPH_LOCK_DN);
CDentry *dn = (CDentry*)lock->get_parent();
int mask = 1;
int mask = 1 | CEPH_LOCK_DN; // old and new bits
// i should also revoke the dir ICONTENT lease, if they have it!
CInode *diri = dn->get_dir()->get_inode();