aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2016-07-01 09:39:20 -0400
committerIlya Dryomov <idryomov@gmail.com>2016-07-27 21:00:38 -0400
commit8aa152c77890abd0731f119e4e6662375503e288 (patch)
treeebe3a679cf8f8c5d945600f6b1b11c799e33523d
parent9b16f03c474d05b16cbd9eed1ec335c6e71cb57b (diff)
ceph: remove ceph_mdsc_lease_release
Nothing calls it. Signed-off-by: Jeff Layton <jlayton@redhat.com> Reviewed-by: Yan, Zheng <zyan@redhat.com>
-rw-r--r--fs/ceph/mds_client.c41
-rw-r--r--fs/ceph/mds_client.h4
2 files changed, 0 insertions, 45 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 0d4bb24c670a..78a3495a11be 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -3292,47 +3292,6 @@ void ceph_mdsc_lease_send_msg(struct ceph_mds_session *session,
3292} 3292}
3293 3293
3294/* 3294/*
3295 * Preemptively release a lease we expect to invalidate anyway.
3296 * Pass @inode always, @dentry is optional.
3297 */
3298void ceph_mdsc_lease_release(struct ceph_mds_client *mdsc, struct inode *inode,
3299 struct dentry *dentry)
3300{
3301 struct ceph_dentry_info *di;
3302 struct ceph_mds_session *session;
3303 u32 seq;
3304
3305 BUG_ON(inode == NULL);
3306 BUG_ON(dentry == NULL);
3307
3308 /* is dentry lease valid? */
3309 spin_lock(&dentry->d_lock);
3310 di = ceph_dentry(dentry);
3311 if (!di || !di->lease_session ||
3312 di->lease_session->s_mds < 0 ||
3313 di->lease_gen != di->lease_session->s_cap_gen ||
3314 !time_before(jiffies, di->time)) {
3315 dout("lease_release inode %p dentry %p -- "
3316 "no lease\n",
3317 inode, dentry);
3318 spin_unlock(&dentry->d_lock);
3319 return;
3320 }
3321
3322 /* we do have a lease on this dentry; note mds and seq */
3323 session = ceph_get_mds_session(di->lease_session);
3324 seq = di->lease_seq;
3325 __ceph_mdsc_drop_dentry_lease(dentry);
3326 spin_unlock(&dentry->d_lock);
3327
3328 dout("lease_release inode %p dentry %p to mds%d\n",
3329 inode, dentry, session->s_mds);
3330 ceph_mdsc_lease_send_msg(session, inode, dentry,
3331 CEPH_MDS_LEASE_RELEASE, seq);
3332 ceph_put_mds_session(session);
3333}
3334
3335/*
3336 * drop all leases (and dentry refs) in preparation for umount 3295 * drop all leases (and dentry refs) in preparation for umount
3337 */ 3296 */
3338static void drop_leases(struct ceph_mds_client *mdsc) 3297static void drop_leases(struct ceph_mds_client *mdsc)
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index 2ce8e9f9bfc9..9dd2c82379f8 100644
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -385,10 +385,6 @@ extern void ceph_mdsc_destroy(struct ceph_fs_client *fsc);
385 385
386extern void ceph_mdsc_sync(struct ceph_mds_client *mdsc); 386extern void ceph_mdsc_sync(struct ceph_mds_client *mdsc);
387 387
388extern void ceph_mdsc_lease_release(struct ceph_mds_client *mdsc,
389 struct inode *inode,
390 struct dentry *dn);
391
392extern void ceph_invalidate_dir_request(struct ceph_mds_request *req); 388extern void ceph_invalidate_dir_request(struct ceph_mds_request *req);
393extern int ceph_alloc_readdir_reply_buffer(struct ceph_mds_request *req, 389extern int ceph_alloc_readdir_reply_buffer(struct ceph_mds_request *req,
394 struct inode *dir); 390 struct inode *dir);