LU-274 Update LVB from disk when glimpse callback return error

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

diff --git a/lustre/ldlm/ldlm_pool.c b/lustre/ldlm/ldlm_pool.c
index fa55e42..1219b39 100644 (file)
--- a/lustre/ldlm/ldlm_pool.c
+++ b/lustre/ldlm/ldlm_pool.c
@@ -551,7 +551,7 @@ static int ldlm_cli_pool_shrink(struct ldlm_pool *pl,
         cfs_spin_unlock(&ns->ns_lock);
         
         if (nr) {
-                canceled = ldlm_cancel_lru(ns, nr, LDLM_SYNC, 
+                canceled = ldlm_cancel_lru(ns, nr, LDLM_ASYNC,
                                            LDLM_CANCEL_SHRINK);
         }
 #ifdef __KERNEL__
@@ -1151,12 +1151,14 @@ static int ldlm_pools_shrink(ldlm_side_t client, int nr,
         return cached;
 }
 
-static int KERN_SHRINKER(ldlm_pools_srv_shrink)
+static int ldlm_pools_srv_shrink(SHRINKER_FIRST_ARG int nr_to_scan,
+                                 unsigned int gfp_mask)
 {
         return ldlm_pools_shrink(LDLM_NAMESPACE_SERVER, nr_to_scan, gfp_mask);
 }
 
-static int KERN_SHRINKER(ldlm_pools_cli_shrink)
+static int ldlm_pools_cli_shrink(SHRINKER_FIRST_ARG int nr_to_scan,
+                                 unsigned int gfp_mask)
 {
         return ldlm_pools_shrink(LDLM_NAMESPACE_CLIENT, nr_to_scan, gfp_mask);
 }