diff options
author | Sage Weil <sage@newdream.net> | 2010-05-25 19:45:25 -0400 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2010-05-29 12:12:42 -0400 |
commit | dd1c9057366f329911180e9000e2b425f23fc287 (patch) | |
tree | 719ad55ef41a86aaa98419ade71b005306456ed6 /fs/ceph/mds_client.c | |
parent | 7e34bc524ecae3a04d8cc427ee76ddad826a937b (diff) |
ceph: make lease code DN specific
The lease code includes a mask in the CEPH_LOCK_* namespace, but that
namespace is changing, and only one mask (formerly _DN == 1) is used, so
hard code for that value for now.
If we ever extend this code to handle leases over different data types we
can extend it accordingly.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/mds_client.c')
-rw-r--r-- | fs/ceph/mds_client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 08413c8a85b2..5a88b7bb3798 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c | |||
@@ -2541,7 +2541,7 @@ void ceph_mdsc_lease_send_msg(struct ceph_mds_session *session, | |||
2541 | return; | 2541 | return; |
2542 | lease = msg->front.iov_base; | 2542 | lease = msg->front.iov_base; |
2543 | lease->action = action; | 2543 | lease->action = action; |
2544 | lease->mask = cpu_to_le16(CEPH_LOCK_DN); | 2544 | lease->mask = cpu_to_le16(1); |
2545 | lease->ino = cpu_to_le64(ceph_vino(inode).ino); | 2545 | lease->ino = cpu_to_le64(ceph_vino(inode).ino); |
2546 | lease->first = lease->last = cpu_to_le64(ceph_vino(inode).snap); | 2546 | lease->first = lease->last = cpu_to_le64(ceph_vino(inode).snap); |
2547 | lease->seq = cpu_to_le32(seq); | 2547 | lease->seq = cpu_to_le32(seq); |
@@ -2571,7 +2571,7 @@ void ceph_mdsc_lease_release(struct ceph_mds_client *mdsc, struct inode *inode, | |||
2571 | 2571 | ||
2572 | BUG_ON(inode == NULL); | 2572 | BUG_ON(inode == NULL); |
2573 | BUG_ON(dentry == NULL); | 2573 | BUG_ON(dentry == NULL); |
2574 | BUG_ON(mask != CEPH_LOCK_DN); | 2574 | BUG_ON(mask == 0); |
2575 | 2575 | ||
2576 | /* is dentry lease valid? */ | 2576 | /* is dentry lease valid? */ |
2577 | spin_lock(&dentry->d_lock); | 2577 | spin_lock(&dentry->d_lock); |