compilation fixups

diff --git a/lustre/include/linux/lustre_dlm.h b/lustre/include/linux/lustre_dlm.h
index 14b4e1b..cabe734 100644 (file)
--- a/lustre/include/linux/lustre_dlm.h
+++ b/lustre/include/linux/lustre_dlm.h
@@ -241,7 +241,7 @@ struct ldlm_resource *ldlm_resource_addref(struct ldlm_resource *res);
 int ldlm_resource_put(struct ldlm_resource *res);
 void ldlm_resource_add_lock(struct ldlm_resource *res, struct list_head *head,
                             struct ldlm_lock *lock);
-int ldlm_resource_del_lock(struct ldlm_lock *lock);
+void ldlm_resource_del_lock(struct ldlm_lock *lock);
 void ldlm_res2desc(struct ldlm_resource *res, struct ldlm_resource_desc *desc);
 void ldlm_resource_dump(struct ldlm_resource *res);
 

diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c
index 0094dc3..4551fe6 100644 (file)
--- a/lustre/ldlm/ldlm_resource.c
+++ b/lustre/ldlm/ldlm_resource.c
@@ -117,9 +117,9 @@ int ldlm_namespace_free(struct ldlm_namespace *ns)
                         if (rc == 0) {
                                 CERROR("Resource refcount nonzero (%d) after "
                                        "lock cleanup; forcing cleanup.\n",
-                                       res->lr_refcount);
+                                       atomic_read(&res->lr_refcount));
                                 ldlm_resource_dump(res);
-                                res->lr_refcount = 1;
+                                atomic_set(&res->lr_refcount, 1);
                                 rc = ldlm_resource_put(res);
                         }
                 }
@@ -319,9 +319,9 @@ void ldlm_resource_add_lock(struct ldlm_resource *res, struct list_head *head,
 
 void ldlm_resource_del_lock(struct ldlm_lock *lock)
 {
-        l_lock(&res->lr_namespace->ns_lock);
+        l_lock(&lock->l_resource->lr_namespace->ns_lock);
         list_del_init(&lock->l_res_link);
-        l_unlock(&res->lr_namespace->ns_lock);
+        l_unlock(&lock->l_resource->lr_namespace->ns_lock);
 }
 
 int ldlm_get_resource_handle(struct ldlm_resource *res, struct lustre_handle *h)
@@ -351,7 +351,7 @@ void ldlm_resource_dump(struct ldlm_resource *res)
                  (unsigned long long)res->lr_name[2]);
 
         CDEBUG(D_OTHER, "--- Resource: %p (%s) (rc: %d)\n", res, name,
-               res->lr_refcount);
+               atomic_read(&res->lr_refcount));
         CDEBUG(D_OTHER, "Namespace: %p (%s)\n", res->lr_namespace,
                res->lr_namespace->ns_name);
         CDEBUG(D_OTHER, "Parent: %p, root: %p\n", res->lr_parent, res->lr_root);

diff --git a/lustre/tests/intent-test.sh b/lustre/tests/intent-test.sh
index bf79619..232801b 100755 (executable)
--- a/lustre/tests/intent-test.sh
+++ b/lustre/tests/intent-test.sh
@@ -123,3 +123,8 @@ echo "trucating to 4 bytes now..."
 ./truncate /mnt/lustre/iotest 4
 cat  /mnt/lustre/iotest
 
+umount /mnt/lustre
+mount -t lustre_lite -o ost=$OST,mds=$MDS none /mnt/lustre
+
+ls /mnt/lustre
+rmdir /mnt/lustre/foo