staging/lustre/ldlm: Remove ldlm_glimpse_ast()

Only used on the server.

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
index 432222b920386ed77f158f7a3957cec245ac7f75..8b2b092af00513dd7e0bc63eec88d681f29fe7b0 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
@@ -1282,7 +1282,6 @@ int ldlm_expired_completion_wait(void *data);
 int ldlm_blocking_ast_nocheck(struct ldlm_lock *lock);
 int ldlm_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
                      void *data, int flag);
-int ldlm_glimpse_ast(struct ldlm_lock *lock, void *reqp);
 int ldlm_completion_ast_async(struct ldlm_lock *lock, __u64 flags, void *data);
 int ldlm_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data);
 /** @} ldlm_local_ast */

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
index c73661cae8af92b0d7243f11e88904c75d173d52..a9159fda937bf62873d9dc243d383e6d6ed1e28f 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
@@ -358,34 +358,6 @@ int ldlm_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
 }
 EXPORT_SYMBOL(ldlm_blocking_ast);
 
-/**
- * ->l_glimpse_ast() for DLM extent locks acquired on the server-side. See
- * comment in filter_intent_policy() on why you may need this.
- */
-int ldlm_glimpse_ast(struct ldlm_lock *lock, void *reqp)
-{
-       /*
-        * Returning -ELDLM_NO_LOCK_DATA actually works, but the reason for
-        * that is rather subtle: with OST-side locking, it may so happen that
-        * _all_ extent locks are held by the OST. If client wants to obtain
-        * current file size it calls ll{,u}_glimpse_size(), and (as locks are
-        * on the server), dummy glimpse callback fires and does
-        * nothing. Client still receives correct file size due to the
-        * following fragment in filter_intent_policy():
-        *
-        * rc = l->l_glimpse_ast(l, NULL); // this will update the LVB
-        * if (rc != 0 && res->lr_namespace->ns_lvbo &&
-        *     res->lr_namespace->ns_lvbo->lvbo_update) {
-        *       res->lr_namespace->ns_lvbo->lvbo_update(res, NULL, 0, 1);
-        * }
-        *
-        * that is, after glimpse_ast() fails, filter_lvbo_update() runs, and
-        * returns correct file size to the client.
-        */
-       return -ELDLM_NO_LOCK_DATA;
-}
-EXPORT_SYMBOL(ldlm_glimpse_ast);
-
 static void failed_lock_cleanup(struct ldlm_namespace *ns,
                                struct ldlm_lock *lock, int mode)
 {