staging: lustre: remove LPX64 define

[deliverable/linux.git] / drivers / staging / lustre / lustre / ldlm / ldlm_resource.c

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
index 25ce0e5f9892a9682f5c4a9ad30cff80b672a9ea..ff40707e12ae6d3f919b2cfb53b83c5035834923 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
@@ -40,10 +40,9 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LDLM
-# include <lustre_dlm.h>
-
-#include <lustre_fid.h>
-#include <obd_class.h>
+#include "../include/lustre_dlm.h"
+#include "../include/lustre_fid.h"
+#include "../include/obd_class.h"
 #include "ldlm_internal.h"
 
 struct kmem_cache *ldlm_resource_slab, *ldlm_lock_slab;
@@ -1134,9 +1133,9 @@ ldlm_resource_get(struct ldlm_namespace *ns, struct ldlm_resource *parent,
                OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_CREATE_RESOURCE, 2);
                rc = ns->ns_lvbo->lvbo_init(res);
                if (rc < 0) {
-                       CERROR("%s: lvbo_init failed for resource "LPX64":"
-                              LPX64": rc = %d\n", ns->ns_obd->obd_name,
-                              name->name[0], name->name[1], rc);
+                       CERROR("%s: lvbo_init failed for resource %#llx:%#llx: rc = %d\n",
+                              ns->ns_obd->obd_name, name->name[0],
+                              name->name[1], rc);
                        if (res->lr_lvb_data) {
                                OBD_FREE(res->lr_lvb_data, res->lr_lvb_len);
                                res->lr_lvb_data = NULL;
@@ -1370,7 +1369,7 @@ void ldlm_namespace_dump(int level, struct ldlm_namespace *ns)
               ldlm_ns_name(ns), atomic_read(&ns->ns_bref),
               ns_is_client(ns) ? "client" : "server");
 
-       if (cfs_time_before(cfs_time_current(), ns->ns_next_dump))
+       if (time_before(cfs_time_current(), ns->ns_next_dump))
                return;
 
        cfs_hash_for_each_nolock(ns->ns_rs_hash,