X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_capa.h;h=6e0873a6887c7edfa8c59e5ed96b819f33d0f8bc;hb=73e0d8cff3ff7fc6cd57badab434f9511b125704;hp=73d7b724bb84a139fd6f008bb6b4c76352c9fbd1;hpb=90dfed8469d46f4b79ebdff8121eb109b5db6746;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_capa.h b/lustre/include/lustre_capa.h
index 73d7b72..6e0873a 100644
--- a/lustre/include/lustre_capa.h
+++ b/lustre/include/lustre_capa.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -135,9 +133,9 @@ static inline __u32 capa_keyid(struct lustre_capa *capa)
         return capa->lc_keyid;
 }
 
-static inline __u64 capa_key_mdsid(struct lustre_capa_key *key)
+static inline __u64 capa_key_seq(struct lustre_capa_key *key)
 {
-        return key->lk_mdsid;
+        return key->lk_seq;
 }
 
 static inline __u32 capa_key_keyid(struct lustre_capa_key *key)
@@ -155,19 +153,22 @@ static inline __u32 capa_expiry(struct lustre_capa *capa)
         return capa->lc_expiry;
 }
 
-#define DEBUG_CAPA(level, c, fmt, args...)                                     \
+void _debug_capa(struct lustre_capa *, struct libcfs_debug_msg_data *,
+                 const char *fmt, ... );
+#define DEBUG_CAPA(level, capa, fmt, args...)                                  \
 do {                                                                           \
-CDEBUG(level, fmt " capability@%p fid "DFID" opc "LPX64" uid "LPU64" gid "     \
-       LPU64" flags %u alg %d keyid %u timeout %u expiry %u\n",                \
-       ##args, c, PFID(capa_fid(c)), capa_opc(c), capa_uid(c), capa_gid(c),    \
-       capa_flags(c), capa_alg(c), capa_keyid(c), capa_timeout(c),             \
-       capa_expiry(c));                                                        \
+        if (((level) & D_CANTMASK) != 0 ||                                     \
+            ((libcfs_debug & (level)) != 0 &&                                  \
+             (libcfs_subsystem_debug & DEBUG_SUBSYSTEM) != 0)) {               \
+                LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, level, NULL);              \
+                _debug_capa((capa), &msgdata, fmt, ##args);                    \
+        }                                                                      \
 } while (0)
 
 #define DEBUG_CAPA_KEY(level, k, fmt, args...)                                 \
 do {                                                                           \
-CDEBUG(level, fmt " capability key@%p mdsid "LPU64" keyid %u\n",               \
-       ##args, k, capa_key_mdsid(k), capa_key_keyid(k));                       \
+CDEBUG(level, fmt " capability key@%p seq "LPU64" keyid %u\n",                 \
+       ##args, k, capa_key_seq(k), capa_key_keyid(k));                         \
 } while (0)
 
 typedef int (* renew_capa_cb_t)(struct obd_capa *, struct lustre_capa *);