X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Finclude%2Flustre_capa.h;h=33f11997d892541b389293d63c57b90735e54479;hb=d750891e478804bc495ffa075d771d1816369958;hp=73d7b724bb84a139fd6f008bb6b4c76352c9fbd1;hpb=45c495867c903379ec9e9acf01d3d49caffa36e4;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre_capa.h b/lustre/include/lustre_capa.h index 73d7b72..33f1199 100644 --- a/lustre/include/lustre_capa.h +++ b/lustre/include/lustre_capa.h @@ -26,7 +26,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 +135,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) @@ -166,8 +166,8 @@ CDEBUG(level, fmt " capability@%p fid "DFID" opc "LPX64" uid "LPU64" gid " \ #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 *);