- Fixed an unaligned structure that I introduced yesterday

- Change a harmless lock message from CERROR to CDEBUG

diff --git a/lustre/include/linux/lustre_idl.h b/lustre/include/linux/lustre_idl.h
index 23f25c6..5fa1c0b 100644 (file)
--- a/lustre/include/linux/lustre_idl.h
+++ b/lustre/include/linux/lustre_idl.h
@@ -446,6 +446,8 @@ struct ldlm_intent {
         __u64 opc;
 };
 
+/* Note this unaligned structure; as long as it's only used in ldlm_request
+ * below, we're probably fine. */
 struct ldlm_resource_desc {
         __u32 lr_type;
         __u64 lr_name[RES_NAME_SIZE];
@@ -469,8 +471,8 @@ struct ldlm_request {
 
 struct ldlm_reply {
         __u32 lock_flags;
-        __u64 lock_resource_name[RES_NAME_SIZE];
         __u32 lock_mode;
+        __u64 lock_resource_name[RES_NAME_SIZE];
         struct lustre_handle lock_handle;
         struct ldlm_extent lock_extent;   /* XXX make this policy 1 &2 */
         __u64  lock_policy_res1;

diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c
index 297da2e..8412473 100644 (file)
--- a/lustre/ldlm/ldlm_resource.c
+++ b/lustre/ldlm/ldlm_resource.c
@@ -119,9 +119,8 @@ static void cleanup_resource(struct ldlm_resource *res, struct list_head *q)
                                 ldlm_lock_cancel(lock);
                         }
                 } else {
-                        CERROR("Freeing lock %p still held by client node.\n",
-                               lock);
-                        ldlm_lock_dump(lock);
+                        LDLM_DEBUG(lock, "Freeing a lock still held by a "
+                                   "client node.\n");
 
                         ldlm_resource_unlink_lock(lock);
                         ldlm_lock_destroy(lock);

diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index 8b2a80f..aa59bbf 100644 (file)
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -1,7 +1,7 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- * Copyright (C) 2001  Cluster File Systems, Inc.
+ * Copyright (C) 2001, 2002 Cluster File Systems, Inc.
  *
  * This code is issued under the GNU General Public License.
  * See the file COPYING in this distribution
@@ -10,7 +10,6 @@
  * infrastructure for managing object devices
  *
  * Object Devices Class Driver
- *              Copyright (C) 2002 Cluster File Systems, Inc.
  */
 
 #define EXPORT_SYMTAB