X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre%2Flustre_idl.h;h=17b4db6bf5f8a95b3c1cf744e0affc4df75a139b;hb=7a92b5181e1983a39630dce31c09407079fdbdbc;hp=c877670d173dca314e3bc438e634c8d0a58b1f84;hpb=3192e52a89946f12fd36d28a686c169d01d36e64;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h index c877670d..17b4db6 100644 --- a/lustre/include/lustre/lustre_idl.h +++ b/lustre/include/lustre/lustre_idl.h @@ -1,7 +1,39 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * This file is part of Lustre, http://www.lustre.org + * GPL HEADER START + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + * GPL HEADER END + */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. + * + * lustre/include/lustre/lustre_idl.h * * Lustre wire protocol definitions. * @@ -52,20 +84,11 @@ #ifndef _LUSTRE_IDL_H_ #define _LUSTRE_IDL_H_ -#include - -#if defined(__linux__) -#include -#elif defined(__APPLE__) -#include -#elif defined(__WINNT__) -#include -#else -#error Unsupported operating system. -#endif +#include /* Defn's shared with user-space. */ #include +#include /* * GENERAL STUFF @@ -196,7 +219,7 @@ static inline int range_is_exhausted(struct lu_range *r) struct lu_fid { __u64 f_seq; /* holds fid sequence. Lustre should support 2 ^ 64 * objects, thus even if one sequence has one object we - * reach this value. */ + * will never reach this value. */ __u32 f_oid; /* fid number within its sequence. */ __u32 f_ver; /* holds fid version. */ }; @@ -205,8 +228,6 @@ struct lu_fid { * fid constants */ enum { - LUSTRE_ROOT_FID_SEQ = 1ULL, /* XXX: should go into mkfs. */ - /* initial fid id value */ LUSTRE_FID_INIT_OID = 1UL }; @@ -229,19 +250,55 @@ static inline __u32 fid_ver(const struct lu_fid *fid) return fid->f_ver; } -static inline int fid_seq_is_sane(__u64 seq) -{ - return seq != 0; -} - static inline void fid_zero(struct lu_fid *fid) { memset(fid, 0, sizeof(*fid)); } +/* Normal FID sequence starts from this value, i.e. 1<<33 */ +#define FID_SEQ_START 0x200000000ULL + +/* IDIF sequence starts from this value, i.e. 1<<32 */ +#define IDIF_SEQ_START 0x100000000ULL + +/** + * Check if a fid is igif or not. + * \param fid the fid to be tested. + * \return true if the fid is a igif; otherwise false. + */ static inline int fid_is_igif(const struct lu_fid *fid) { - return fid_seq(fid) == LUSTRE_ROOT_FID_SEQ; + return fid_seq(fid) > 0 && fid_seq(fid) < IDIF_SEQ_START; +} + +/** + * Check if a fid is idif or not. + * \param fid the fid to be tested. + * \return true if the fid is a idif; otherwise false. + */ +static inline int fid_is_idif(const struct lu_fid *fid) +{ + return fid_seq(fid) >= IDIF_SEQ_START && fid_seq(fid) < FID_SEQ_START; +} + +/** + * Get inode number from a igif. + * \param fid a igif to get inode number from. + * \return inode number for the igif. + */ +static inline ino_t lu_igif_ino(const struct lu_fid *fid) +{ + return fid_seq(fid); +} + +/** + * Get inode generation from a igif. + * \param fid a igif to get inode generation from. + * \return inode generation for the igif. + */ +static inline __u32 lu_igif_gen(const struct lu_fid *fid) +{ + return fid_oid(fid); } #define DFID "[0x%16.16"LPF64"x/0x%8.8x:0x%8.8x]" @@ -322,7 +379,7 @@ static inline int fid_is_sane(const struct lu_fid *fid) { return fid != NULL && - ((fid_seq_is_sane(fid_seq(fid)) && fid_oid(fid) != 0 + ((fid_seq(fid) >= FID_SEQ_START && fid_oid(fid) != 0 && fid_ver(fid) == 0) || fid_is_igif(fid)); } @@ -351,16 +408,17 @@ static inline int lu_fid_eq(const struct lu_fid *f0, */ struct lu_dirent { struct lu_fid lde_fid; - __u32 lde_hash; + __u64 lde_hash; __u16 lde_reclen; __u16 lde_namelen; + __u32 lde_pad0; char lde_name[0]; }; struct lu_dirpage { - __u32 ldp_hash_start; - __u32 ldp_hash_end; - __u16 ldp_flags; + __u64 ldp_hash_start; + __u64 ldp_hash_end; + __u32 ldp_flags; __u32 ldp_pad0; struct lu_dirent ldp_entries[0]; }; @@ -371,7 +429,7 @@ enum lu_dirpage_flags { static inline struct lu_dirent *lu_dirent_start(struct lu_dirpage *dp) { - if (le16_to_cpu(dp->ldp_flags) & LDF_EMPTY) + if (le32_to_cpu(dp->ldp_flags) & LDF_EMPTY) return NULL; else return dp->ldp_entries; @@ -393,12 +451,12 @@ static inline int lu_dirent_size(struct lu_dirent *ent) { if (le16_to_cpu(ent->lde_reclen) == 0) { return (sizeof(*ent) + - le16_to_cpu(ent->lde_namelen) + 3) & ~3; + le16_to_cpu(ent->lde_namelen) + 7) & ~7; } return le16_to_cpu(ent->lde_reclen); } -#define DIR_END_OFF 0xfffffffeUL +#define DIR_END_OFF 0xfffffffffffffffeULL struct lustre_handle { __u64 cookie; @@ -422,23 +480,8 @@ static inline void lustre_handle_copy(struct lustre_handle *tgt, tgt->cookie = src->cookie; } -/* we depend on this structure to be 8-byte aligned */ -/* this type is only endian-adjusted in lustre_unpack_msg() */ -struct lustre_msg_v1 { - struct lustre_handle lm_handle; - __u32 lm_magic; - __u32 lm_type; - __u32 lm_version; - __u32 lm_opc; - __u64 lm_last_xid; - __u64 lm_last_committed; - __u64 lm_transno; - __u32 lm_status; - __u32 lm_flags; - __u32 lm_conn_cnt; - __u32 lm_bufcount; - __u32 lm_buflens[0]; -}; +/* flags for lm_flags */ +#define MSGHDR_AT_SUPPORT 0x1 #define lustre_msg lustre_msg_v2 /* we depend on this structure to be 8-byte aligned */ @@ -448,14 +491,15 @@ struct lustre_msg_v2 { __u32 lm_secflvr; __u32 lm_magic; __u32 lm_repsize; - __u32 lm_timeout; - __u32 lm_padding_1; + __u32 lm_cksum; + __u32 lm_flags; __u32 lm_padding_2; __u32 lm_padding_3; __u32 lm_buflens[0]; }; /* without gss, ptlrpc_body is put at the first buffer. */ +#define PTLRPC_NUM_VERSIONS 4 struct ptlrpc_body { struct lustre_handle pb_handle; __u32 pb_type; @@ -469,10 +513,14 @@ struct ptlrpc_body { __u32 pb_flags; __u32 pb_op_flags; __u32 pb_conn_cnt; - __u32 pb_padding_1; - __u32 pb_padding_2; + __u32 pb_timeout; /* for req, the deadline, for rep, the service est */ + __u32 pb_service_time; /* for rep, actual service time */ __u32 pb_limit; __u64 pb_slv; + /* VBR: pre-versions */ + __u64 pb_pre_versions[PTLRPC_NUM_VERSIONS]; + /* padding for future needs */ + __u64 pb_padding[4]; }; extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb); @@ -502,12 +550,18 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb); #define MSG_OP_FLAG_SHIFT 16 /* Flags that apply to all requests are in the bottom 16 bits */ -#define MSG_GEN_FLAG_MASK 0x0000ffff -#define MSG_LAST_REPLAY 1 -#define MSG_RESENT 2 -#define MSG_REPLAY 4 -#define MSG_REQ_REPLAY_DONE 8 -#define MSG_LOCK_REPLAY_DONE 16 +#define MSG_GEN_FLAG_MASK 0x0000ffff +#define MSG_LAST_REPLAY 0x0001 +#define MSG_RESENT 0x0002 +#define MSG_REPLAY 0x0004 +/* #define MSG_AT_SUPPORT 0x0008 + * This was used in early prototypes of adaptive timeouts, and while there + * shouldn't be any users of that code there also isn't a need for using this + * bits. Defer usage until at least 1.10 to avoid potential conflict. */ +#define MSG_DELAY_REPLAY 0x0010 +#define MSG_VERSION_REPLAY 0x0020 +#define MSG_REQ_REPLAY_DONE 0x0040 +#define MSG_LOCK_REPLAY_DONE 0x0080 /* * Flags for all connect opcodes (MDS_CONNECT, OST_CONNECT) @@ -549,7 +603,10 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb); #define OBD_CONNECT_LRU_RESIZE 0x02000000ULL /* Lru resize feature. */ #define OBD_CONNECT_MDS_MDS 0x04000000ULL /* MDS-MDS connection*/ #define OBD_CONNECT_REAL 0x08000000ULL /* real connection */ +#define OBD_CONNECT_CHANGE_QS 0x10000000ULL /*shrink/enlarge qunit size + *b=10600 */ #define OBD_CONNECT_CKSUM 0x20000000ULL /* support several cksum algos */ +#define OBD_CONNECT_FID 0x40000000ULL /* FID is supported by server */ /* also update obd_connect_names[] for lprocfs_rd_connect_flags() * and lustre/utils/wirecheck.c */ @@ -568,15 +625,17 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb); OBD_CONNECT_RMT_CLIENT | \ OBD_CONNECT_MDS_CAPA | OBD_CONNECT_OSS_CAPA | \ OBD_CONNECT_MDS_MDS | OBD_CONNECT_CANCELSET | \ - LRU_RESIZE_CONNECT_FLAG) + OBD_CONNECT_FID | \ + LRU_RESIZE_CONNECT_FLAG | OBD_CONNECT_AT) #define OST_CONNECT_SUPPORTED (OBD_CONNECT_SRVLOCK | OBD_CONNECT_GRANT | \ OBD_CONNECT_REQPORTAL | OBD_CONNECT_VERSION | \ OBD_CONNECT_TRUNCLOCK | OBD_CONNECT_INDEX | \ OBD_CONNECT_BRW_SIZE | OBD_CONNECT_QUOTA64 | \ OBD_CONNECT_OSS_CAPA | OBD_CONNECT_CANCELSET | \ - LRU_RESIZE_CONNECT_FLAG) + OBD_CONNECT_CKSUM | LRU_RESIZE_CONNECT_FLAG | \ + OBD_CONNECT_AT) #define ECHO_CONNECT_SUPPORTED (0) -#define MGS_CONNECT_SUPPORTED (OBD_CONNECT_VERSION) +#define MGS_CONNECT_SUPPORTED (OBD_CONNECT_VERSION | OBD_CONNECT_AT) #define MAX_QUOTA_COUNT32 (0xffffffffULL) @@ -602,14 +661,25 @@ struct obd_connect_data { __u32 ocd_nllg; /* non-local-lustre-group */ __u64 ocd_transno; /* first transno from client to be replayed */ __u32 ocd_group; /* MDS group on OST */ - __u32 padding1; /* also fix lustre_swab_connect */ + __u32 ocd_cksum_types; /* supported checksum algorithms */ + __u64 padding1; /* also fix lustre_swab_connect */ __u64 padding2; /* also fix lustre_swab_connect */ - __u64 padding3; /* also fix lustre_swab_connect */ }; extern void lustre_swab_connect(struct obd_connect_data *ocd); /* + * Supported checksum algorithms. Up to 32 checksum types are supported. + * (32-bit mask stored in obd_connect_data::ocd_cksum_types) + * Please update DECLARE_CKSUM_NAME/OBD_CKSUM_ALL in obd.h when adding a new + * algorithm and also the OBD_FL_CKSUM* flags. + */ +typedef enum { + OBD_CKSUM_CRC32 = 0x00000001, + OBD_CKSUM_ADLER = 0x00000002, +} cksum_type_t; + +/* * OST requests: OBDO & OBD request records */ @@ -637,19 +707,19 @@ typedef enum { } ost_cmd_t; #define OST_FIRST_OPC OST_REPLY -typedef uint64_t obd_id; -typedef uint64_t obd_gr; -typedef uint64_t obd_time; -typedef uint64_t obd_size; -typedef uint64_t obd_off; -typedef uint64_t obd_blocks; -typedef uint32_t obd_blksize; -typedef uint32_t obd_mode; -typedef uint32_t obd_uid; -typedef uint32_t obd_gid; -typedef uint32_t obd_flag; -typedef uint64_t obd_valid; -typedef uint32_t obd_count; +typedef __u64 obd_id; +typedef __u64 obd_gr; +typedef __u64 obd_time; +typedef __u64 obd_size; +typedef __u64 obd_off; +typedef __u64 obd_blocks; +typedef __u32 obd_blksize; +typedef __u32 obd_mode; +typedef __u32 obd_uid; +typedef __u32 obd_gid; +typedef __u32 obd_flag; +typedef __u64 obd_valid; +typedef __u32 obd_count; #define OBD_FL_INLINEDATA (0x00000001) #define OBD_FL_OBDMDEXISTS (0x00000002) @@ -669,6 +739,13 @@ typedef uint32_t obd_count; #define OBD_FL_TRUNCLOCK (0x00000800) /* + * Checksum types + */ +#define OBD_FL_CKSUM_CRC32 (0x00001000) +#define OBD_FL_CKSUM_ADLER (0x00002000) +#define OBD_FL_CKSUM_ALL (OBD_FL_CKSUM_CRC32 | OBD_FL_CKSUM_ADLER) + +/* * This should not be smaller than sizeof(struct lustre_handle) + sizeof(struct * llog_cookie) + sizeof(struct ll_fid). Nevertheless struct ll_fid is not * longer stored in o_inline, we keep this just for case. @@ -848,6 +925,11 @@ struct obd_statfs { }; extern void lustre_swab_obd_statfs (struct obd_statfs *os); +#define OBD_STATFS_NODELAY 0x0001 /* requests should be send without delay + * and resends for avoid deadlocks */ + +#define OBD_STATFS_FROM_CACHE 0x0002 /* the statfs callback should not update + * obd_osfs_age */ /* ost_body.data values for OST_BRW */ @@ -891,8 +973,16 @@ struct ost_body { struct obdo oa; }; +/* Key for FIEMAP to be used in get_info calls */ +struct ll_fiemap_info_key { + char name[8]; + struct obdo oa; + struct ll_user_fiemap fiemap; +}; + extern void lustre_swab_ost_body (struct ost_body *b); extern void lustre_swab_ost_last_id(obd_id *id); +extern void lustre_swab_fiemap(struct ll_user_fiemap *fiemap); /* lock value block communicated between the filter and llite */ @@ -939,7 +1029,7 @@ typedef enum { MDS_QUOTACHECK = 47, MDS_QUOTACTL = 48, MDS_GETXATTR = 49, - MDS_SETXATTR = 50, + MDS_SETXATTR = 50, /* obsolete, now it's MDS_REINT op */ MDS_WRITEPAGE = 51, MDS_IS_SUBDIR = 52, MDS_LAST_OPC @@ -958,6 +1048,9 @@ typedef enum { REINT_UNLINK = 4, REINT_RENAME = 5, REINT_OPEN = 6, + REINT_SETXATTR = 7, +// REINT_CLOSE = 8, +// REINT_WRITE = 9, REINT_MAX } mds_reint_t, mdt_reint_t; @@ -1076,6 +1169,7 @@ struct mdt_body { __u64 ctime; __u64 blocks; /* XID, in the case of MDS_READPAGE */ __u64 ioepoch; + __u64 ino; /* for 1.6 compatibility */ __u32 fsuid; __u32 fsgid; __u32 capability; @@ -1085,11 +1179,13 @@ struct mdt_body { __u32 flags; /* from vfs for pin/unpin, MDS_BFLAG for close */ __u32 rdev; __u32 nlink; /* #bytes to read in the case of MDS_READPAGE */ + __u32 generation; /* for 1.6 compatibility */ __u32 suppgid; __u32 eadatasize; __u32 aclsize; __u32 max_mdsize; - __u32 max_cookiesize; /* also fix lustre_swab_mdt_body */ + __u32 max_cookiesize; + __u32 padding_4; /* also fix lustre_swab_mdt_body */ }; struct mds_body { @@ -1118,7 +1214,7 @@ struct mds_body { __u32 eadatasize; __u32 aclsize; __u32 max_mdsize; - __u32 max_cookiesize; /* also fix lustre_swab_mds_body */ + __u32 max_cookiesize; __u32 padding_4; /* also fix lustre_swab_mds_body */ }; @@ -1213,18 +1309,22 @@ struct mdt_rec_setattr { __u32 sa_fsgid; __u32 sa_cap; __u32 sa_suppgid; - __u32 sa_mode; + __u32 sa_padding_1; struct lu_fid sa_fid; __u64 sa_valid; + __u32 sa_uid; + __u32 sa_gid; __u64 sa_size; __u64 sa_blocks; __u64 sa_mtime; __u64 sa_atime; __u64 sa_ctime; - __u32 sa_uid; - __u32 sa_gid; __u32 sa_attr_flags; - __u32 sa_padding; /* also fix lustre_swab_mds_rec_setattr */ + __u32 sa_mode; + __u32 sa_padding_2; + __u32 sa_padding_3; + __u32 sa_padding_4; + __u32 sa_padding_5; }; extern void lustre_swab_mdt_rec_setattr (struct mdt_rec_setattr *sa); @@ -1306,7 +1406,8 @@ enum { MDS_CHECK_SPLIT = 1 << 0, MDS_CROSS_REF = 1 << 1, MDS_VTX_BYPASS = 1 << 2, - MDS_PERM_BYPASS = 1 << 3 + MDS_PERM_BYPASS = 1 << 3, + MDS_SOM = 1 << 4 }; struct mds_rec_join { @@ -1349,18 +1450,21 @@ struct mdt_rec_create { __u32 cr_fsuid; __u32 cr_fsgid; __u32 cr_cap; - __u32 cr_flags; /* for use with open */ - __u32 cr_mode; - struct lustre_handle cr_old_handle; /* u64 handle in case of open replay */ + __u32 cr_suppgid1; + __u32 cr_suppgid2; struct lu_fid cr_fid1; struct lu_fid cr_fid2; + struct lustre_handle cr_old_handle; /* u64 handle in case of open replay */ __u64 cr_time; __u64 cr_rdev; __u64 cr_ioepoch; - __u32 cr_suppgid1; - __u32 cr_suppgid2; + __u64 cr_padding_1; /* pad for 64 bits*/ + __u32 cr_mode; __u32 cr_bias; - __u32 cr_padding_1; /* pad for 64 bits*/ + __u32 cr_flags; /* for use with open */ + __u32 cr_padding_2; + __u32 cr_padding_3; + __u32 cr_padding_4; }; extern void lustre_swab_mdt_rec_create (struct mdt_rec_create *cr); @@ -1393,14 +1497,18 @@ struct mdt_rec_link { struct lu_fid lk_fid1; struct lu_fid lk_fid2; __u64 lk_time; + __u64 lk_padding_1; + __u64 lk_padding_2; + __u64 lk_padding_3; + __u64 lk_padding_4; __u32 lk_bias; - __u32 lk_padding_2; /* also fix lustre_swab_mds_rec_link */ - __u32 lk_padding_3; /* also fix lustre_swab_mds_rec_link */ - __u32 lk_padding_4; /* also fix lustre_swab_mds_rec_link */ + __u32 lk_padding_5; + __u32 lk_padding_6; + __u32 lk_padding_7; + __u32 lk_padding_8; + __u32 lk_padding_9; }; -extern void lustre_swab_mdt_rec_link (struct mdt_rec_link *lk); - struct mds_rec_unlink { __u32 ul_opcode; __u32 ul_fsuid; @@ -1424,19 +1532,23 @@ struct mdt_rec_unlink { __u32 ul_fsuid; __u32 ul_fsgid; __u32 ul_cap; - __u32 ul_suppgid; - __u32 ul_mode; + __u32 ul_suppgid1; + __u32 ul_suppgid2; struct lu_fid ul_fid1; struct lu_fid ul_fid2; __u64 ul_time; + __u64 ul_padding_2; + __u64 ul_padding_3; + __u64 ul_padding_4; + __u64 ul_padding_5; __u32 ul_bias; - __u32 ul_padding_2; /* also fix lustre_swab_mds_rec_unlink */ - __u32 ul_padding_3; /* also fix lustre_swab_mds_rec_unlink */ - __u32 ul_padding_4; /* also fix lustre_swab_mds_rec_unlink */ + __u32 ul_mode; + __u32 ul_padding_6; + __u32 ul_padding_7; + __u32 ul_padding_8; + __u32 ul_padding_9; }; -extern void lustre_swab_mdt_rec_unlink (struct mdt_rec_unlink *ul); - struct mds_rec_rename { __u32 rn_opcode; __u32 rn_fsuid; @@ -1465,15 +1577,66 @@ struct mdt_rec_rename { struct lu_fid rn_fid1; struct lu_fid rn_fid2; __u64 rn_time; - __u32 rn_mode; /* cross-ref rename has mode */ + __u64 rn_padding_1; + __u64 rn_padding_2; + __u64 rn_padding_3; + __u64 rn_padding_4; __u32 rn_bias; /* some operation flags */ - __u32 rn_padding_3; /* also fix lustre_swab_mdt_rec_rename */ - __u32 rn_padding_4; /* also fix lustre_swab_mdt_rec_rename */ -}; - -extern void lustre_swab_mdt_rec_rename (struct mdt_rec_rename *rn); + __u32 rn_mode; /* cross-ref rename has mode */ + __u32 rn_padding_5; + __u32 rn_padding_6; + __u32 rn_padding_7; + __u32 rn_padding_8; +}; + +struct mdt_rec_setxattr { + __u32 sx_opcode; + __u32 sx_fsuid; + __u32 sx_fsgid; + __u32 sx_cap; + __u32 sx_suppgid1; + __u32 sx_suppgid2; + struct lu_fid sx_fid; + __u64 sx_padding_1; /* These three members are lu_fid size */ + __u32 sx_padding_2; + __u32 sx_padding_3; + __u64 sx_valid; + __u64 sx_time; + __u64 sx_padding_5; + __u64 sx_padding_6; + __u64 sx_padding_7; + __u32 sx_size; + __u32 sx_flags; + __u32 sx_padding_8; + __u32 sx_padding_9; + __u32 sx_padding_10; + __u32 sx_padding_11; +}; + +struct mdt_rec_reint { + __u32 rr_opcode; + __u32 rr_fsuid; + __u32 rr_fsgid; + __u32 rr_cap; + __u32 rr_suppgid1; + __u32 rr_suppgid2; + struct lu_fid rr_fid1; + struct lu_fid rr_fid2; + __u64 rr_mtime; + __u64 rr_atime; + __u64 rr_ctime; + __u64 rr_size; + __u64 rr_blocks; + __u32 rr_bias; + __u32 rr_mode; + __u32 rr_padding_1; /* also fix lustre_swab_mdt_rec_reint */ + __u32 rr_padding_2; /* also fix lustre_swab_mdt_rec_reint */ + __u32 rr_padding_3; /* also fix lustre_swab_mdt_rec_reint */ + __u32 rr_padding_4; /* also fix lustre_swab_mdt_rec_reint */ +}; + +extern void lustre_swab_mdt_rec_reint(struct mdt_rec_reint *rr); -/* begin adding MDT by huanghua@clusterfs.com */ struct lmv_desc { __u32 ld_tgt_count; /* how many MDS's */ __u32 ld_active_tgt_count; /* how many active */ @@ -1481,7 +1644,6 @@ struct lmv_desc { }; extern void lustre_swab_lmv_desc (struct lmv_desc *ld); -/* end adding MDT by huanghua@clusterfs.com */ struct md_fld { seqno_t mf_seq; @@ -1576,6 +1738,8 @@ typedef enum { LCK_MAXMODE } ldlm_mode_t; +#define LCK_MODE_NUM 7 + typedef enum { LDLM_PLAIN = 10, LDLM_EXTENT = 11, @@ -1592,6 +1756,12 @@ struct ldlm_extent { __u64 gid; }; +static inline int ldlm_extent_overlap(struct ldlm_extent *ex1, + struct ldlm_extent *ex2) +{ + return (ex1->start <= ex2->end) && (ex2->start <= ex1->end); +} + struct ldlm_inodebits { __u64 bits; };