LU-3280 ldlm: suppress useless lock RPC for layout

[fs/lustre-release.git] / lustre / ldlm / ldlm_lock.c

diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index cdd4c6d..97a8c14 100644 (file)
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2010, 2012, Intel Corporation.
+ * Copyright (c) 2010, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -881,20 +881,6 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode)
 
         ldlm_lock_decref_internal_nolock(lock, mode);
 
-       /* release lvb data for layout lock */
-       if (ns_is_client(ns) && !lock->l_readers && !lock->l_writers &&
-           ldlm_has_layout(lock) && lock->l_flags & LDLM_FL_LVB_READY) {
-               /* this is the last user of a layout lock and stripe has
-                * been set up, lvb is no longer used.
-                * This may be a large amount of memory, so we should free it
-                * when possible. */
-               if (lock->l_lvb_data != NULL) {
-                       OBD_FREE_LARGE(lock->l_lvb_data, lock->l_lvb_len);
-                       lock->l_lvb_data = NULL;
-                       lock->l_lvb_len = 0;
-               }
-       }
-
         if (lock->l_flags & LDLM_FL_LOCAL &&
             !lock->l_readers && !lock->l_writers) {
                 /* If this is a local lock on a server namespace and this was
@@ -943,7 +929,7 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode)
                  * enqueue. */
                 if (!exp_connect_cancelset(lock->l_conn_export) &&
                     !ns_connect_lru_resize(ns))
-                        ldlm_cancel_lru(ns, 0, LDLM_ASYNC, 0);
+                       ldlm_cancel_lru(ns, 0, LCF_ASYNC, 0);
         } else {
                 LDLM_DEBUG(lock, "do not add lock into lru list");
                 unlock_res_and_lock(lock);