Merge branch 'master' of git.lustre.org:prime/lustre

[fs/lustre-release.git] / lustre / llite / vvp_lock.c

diff --git a/lustre/llite/vvp_lock.c b/lustre/llite/vvp_lock.c
index f0c487d..f94f651 100644 (file)
--- a/lustre/llite/vvp_lock.c
+++ b/lustre/llite/vvp_lock.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -69,10 +69,11 @@ static unsigned long vvp_lock_weigh(const struct lu_env *env,
         struct ccc_object *cob = cl2ccc(slice->cls_obj);
 
         ENTRY;
-        RETURN(atomic_read(&cob->cob_mmap_cnt) > 0 ? ~0UL >> 2 : 0);
+        RETURN(cfs_atomic_read(&cob->cob_mmap_cnt) > 0 ? ~0UL >> 2 : 0);
 }
 
 static const struct cl_lock_operations vvp_lock_ops = {
+        .clo_delete    = ccc_lock_delete,
         .clo_fini      = ccc_lock_fini,
         .clo_enqueue   = ccc_lock_enqueue,
         .clo_wait      = ccc_lock_wait,