X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flustre%2Flustre_idl.h;h=ff040ba5df51f04b02473e4145a89d56a875e101;hp=b99ad84e2fac21996112d5e96a1995c64d6dad9b;hb=62499626b81f83f9e2ceceaa11d9b33861581cb6;hpb=7358e0b344f8455f1a07fffeb4ae2dd2a85b47b3 diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h index b99ad84..ff040ba 100644 --- a/lustre/include/lustre/lustre_idl.h +++ b/lustre/include/lustre/lustre_idl.h @@ -1,10 +1,46 @@ /* -*- 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. + */ + +/** \defgroup lustreidl lustreidl * + * Lustre wire protocol definitions. * * We assume all nodes are either little-endian or big-endian, and we * always send messages in the sender's native format. The receiver @@ -47,25 +83,18 @@ * For variable length types, a second 'lustre_swab_v_xxxtypexxx()' routine * may be defined that swabs just the variable part, after the caller has * verified that the message buffer is large enough. + * + * @{ */ #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 @@ -193,55 +222,112 @@ static inline int range_is_exhausted(struct lu_range *r) (range)->lr_start, \ (range)->lr_end -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. */ - __u32 f_oid; /* fid number within its sequence. */ - __u32 f_ver; /* holds fid version. */ -}; +/** \defgroup lu_fid lu_fid + * @{ */ -/* +/** + * File identifier. + * + * Fid is a cluster-wide unique identifier of a file or an object + * (stripe). Fids are never reused. Fids are transmitted across network (in + * the sender byte-ordering), and stored on disk in a packed form (struct + * lu_fid_pack) in a big-endian order. + */ +struct lu_fid { + /** + * fid sequence. Sequence is a unit of migration: all files (objects) + * with fids from a given sequence are stored on the same + * server. + * + * Lustre should support 2 ^ 64 objects, thus even if one + * sequence has one object we will never reach this value. + */ + __u64 f_seq; + /** fid number within sequence. */ + __u32 f_oid; + /** + * fid version, used to distinguish different versions (in the sense + * of snapshots, etc.) of the same file system object. Not currently + * used. + */ + __u32 f_ver; +}; + +/** * fid constants */ enum { - LUSTRE_ROOT_FID_SEQ = 1ULL, /* XXX: should go into mkfs. */ - /* initial fid id value */ LUSTRE_FID_INIT_OID = 1UL }; -/* get object sequence */ +/** returns fid object sequence */ static inline __u64 fid_seq(const struct lu_fid *fid) { return fid->f_seq; } -/* get object id */ +/** returns fid object id */ static inline __u32 fid_oid(const struct lu_fid *fid) { return fid->f_oid; } -/* get object version */ +/** returns fid object version */ 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]" @@ -251,7 +337,30 @@ static inline int fid_is_igif(const struct lu_fid *fid) fid_oid(fid), \ fid_ver(fid) -#ifdef __KERNEL__ +static inline void fid_cpu_to_le(struct lu_fid *dst, const struct lu_fid *src) +{ + /* check that all fields are converted */ + CLASSERT(sizeof *src == + sizeof fid_seq(src) + + sizeof fid_oid(src) + sizeof fid_ver(src)); + LASSERTF(fid_is_igif(src) || fid_ver(src) == 0, DFID"\n", PFID(src)); + dst->f_seq = cpu_to_le64(fid_seq(src)); + dst->f_oid = cpu_to_le32(fid_oid(src)); + dst->f_ver = cpu_to_le32(fid_ver(src)); +} + +static inline void fid_le_to_cpu(struct lu_fid *dst, const struct lu_fid *src) +{ + /* check that all fields are converted */ + CLASSERT(sizeof *src == + sizeof fid_seq(src) + + sizeof fid_oid(src) + sizeof fid_ver(src)); + dst->f_seq = le64_to_cpu(fid_seq(src)); + dst->f_oid = le32_to_cpu(fid_oid(src)); + dst->f_ver = le32_to_cpu(fid_ver(src)); + LASSERTF(fid_is_igif(dst) || fid_ver(dst) == 0, DFID"\n", PFID(dst)); +} + static inline void fid_cpu_to_be(struct lu_fid *dst, const struct lu_fid *src) { /* check that all fields are converted */ @@ -276,7 +385,7 @@ static inline void fid_be_to_cpu(struct lu_fid *dst, const struct lu_fid *src) LASSERTF(fid_is_igif(dst) || fid_ver(dst) == 0, DFID"\n", PFID(dst)); } -/* +/** * Storage representation for fids. * * Variable size, first byte contains the length of the whole record. @@ -291,14 +400,11 @@ void fid_pack(struct lu_fid_pack *pack, const struct lu_fid *fid, struct lu_fid *befider); int fid_unpack(const struct lu_fid_pack *pack, struct lu_fid *fid); -/* __KERNEL__ */ -#endif - 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)); } @@ -322,21 +428,43 @@ static inline int lu_fid_eq(const struct lu_fid *f0, return memcmp(f0, f1, sizeof *f0) == 0; } -/* +#define __diff_normalize(val0, val1) \ +({ \ + typeof(val0) __val0 = (val0); \ + typeof(val1) __val1 = (val1); \ + \ + (__val0 == __val1 ? 0 : __val0 > __val1 ? +1 : -1); \ +}) + +static inline int lu_fid_cmp(const struct lu_fid *f0, + const struct lu_fid *f1) +{ + return + __diff_normalize(fid_seq(f0), fid_seq(f1)) ?: + __diff_normalize(fid_oid(f0), fid_oid(f1)) ?: + __diff_normalize(fid_ver(f0), fid_ver(f1)); +} + +/** @} lu_fid */ + +/** \defgroup lu_dir lu_dir + * @{ */ +/** * Layout of readdir pages, as transmitted on wire. */ 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]; }; @@ -347,7 +475,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; @@ -369,12 +497,14 @@ 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 + +/** @} lu_dir */ struct lustre_handle { __u64 cookie; @@ -398,23 +528,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 */ @@ -424,14 +539,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; @@ -445,10 +561,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); @@ -478,12 +598,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) @@ -525,10 +651,20 @@ 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 b=10600 */ +#define OBD_CONNECT_CKSUM 0x20000000ULL /* support several cksum algos */ +#define OBD_CONNECT_FID 0x40000000ULL /* FID is supported by server */ +#define OBD_CONNECT_LOV_V3 0x100000000ULL /* client supports lov v3 ea */ /* also update obd_connect_names[] for lprocfs_rd_connect_flags() * and lustre/utils/wirecheck.c */ +#ifdef HAVE_LRU_RESIZE_SUPPORT +#define LRU_RESIZE_CONNECT_FLAG OBD_CONNECT_LRU_RESIZE +#else +#define LRU_RESIZE_CONNECT_FLAG 0 +#endif + #define MDT_CONNECT_SUPPORTED (OBD_CONNECT_RDONLY | OBD_CONNECT_VERSION | \ OBD_CONNECT_ACL | OBD_CONNECT_XATTR | \ OBD_CONNECT_IBITS | OBD_CONNECT_JOIN | \ @@ -537,15 +673,18 @@ 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 | \ - OBD_CONNECT_LRU_RESIZE) + OBD_CONNECT_FID | \ + LRU_RESIZE_CONNECT_FLAG | OBD_CONNECT_AT | \ + OBD_CONNECT_LOV_V3) #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 | \ - OBD_CONNECT_LRU_RESIZE) + 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) @@ -571,14 +710,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 */ @@ -606,19 +756,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) @@ -630,7 +780,7 @@ typedef uint32_t obd_count; #define OBD_FL_NO_USRQUOTA (0x00000100) /* the object's owner is over quota */ #define OBD_FL_NO_GRPQUOTA (0x00000200) /* the object's group is over quota */ -/* +/** * Set this to delegate DLM locking during obd_punch() to the OSTs. Only OSTs * that declared OBD_CONNECT_TRUNCLOCK in their connect flags support this * functionality. @@ -638,59 +788,25 @@ typedef uint32_t obd_count; #define OBD_FL_TRUNCLOCK (0x00000800) /* - * 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. + * Checksum types */ -#define OBD_INLINESZ 80 - -/* Note: 64-bit types are 64-bit aligned in structure */ -struct obdo { - obd_valid o_valid; /* hot fields in this obdo */ - obd_id o_id; - obd_gr o_gr; - obd_id o_fid; - obd_size o_size; /* o_size-o_blocks == ost_lvb */ - obd_time o_mtime; - obd_time o_atime; - obd_time o_ctime; - obd_blocks o_blocks; /* brw: cli sent cached bytes */ - obd_size o_grant; - - /* 32-bit fields start here: keep an even number of them via padding */ - obd_blksize o_blksize; /* optimal IO blocksize */ - obd_mode o_mode; /* brw: cli sent cache remain */ - obd_uid o_uid; - obd_gid o_gid; - obd_flag o_flags; - obd_count o_nlink; /* brw: checksum */ - obd_count o_generation; - obd_count o_misc; /* brw: o_dropped */ - __u32 o_easize; /* epoch in ost writes */ - __u32 o_mds; - __u32 o_stripe_idx; /* holds stripe idx */ - __u32 o_padding_1; - char o_inline[OBD_INLINESZ]; - /* lustre_handle + llog_cookie */ -}; - -#define o_dirty o_blocks -#define o_undirty o_mode -#define o_dropped o_misc -#define o_cksum o_nlink - -extern void lustre_swab_obdo (struct obdo *o); - +#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) #define LOV_MAGIC_V1 0x0BD10BD0 #define LOV_MAGIC LOV_MAGIC_V1 #define LOV_MAGIC_JOIN 0x0BD20BD0 +#define LOV_MAGIC_V3 0x0BD30BD0 #define LOV_PATTERN_RAID0 0x001 /* stripes are used round-robin */ #define LOV_PATTERN_RAID1 0x002 /* stripes are mirrors of each other */ #define LOV_PATTERN_FIRST 0x100 /* first stripe is not in round-robin */ #define LOV_PATTERN_CMOBD 0x200 +#define LOV_OBJECT_GROUP_DEFAULT ~0ULL +#define LOV_OBJECT_GROUP_CLEAR 0ULL + #define lov_ost_data lov_ost_data_v1 struct lov_ost_data_v1 { /* per-stripe data structure (little-endian)*/ __u64 l_object_id; /* OST object ID */ @@ -710,7 +826,7 @@ struct lov_mds_md_v1 { /* LOV EA mds/wire data (little-endian) */ struct lov_ost_data_v1 lmm_objects[0]; /* per-stripe data */ }; -extern void lustre_swab_lov_mds_md(struct lov_mds_md *llm); +/* extern void lustre_swab_lov_mds_md(struct lov_mds_md *llm); */ #define MAX_MD_SIZE (sizeof(struct lov_mds_md) + 4 * sizeof(struct lov_ost_data)) #define MIN_MD_SIZE (sizeof(struct lov_mds_md) + 1 * sizeof(struct lov_ost_data)) @@ -719,8 +835,17 @@ extern void lustre_swab_lov_mds_md(struct lov_mds_md *llm); #define XATTR_NAME_ACL_DEFAULT "system.posix_acl_default" #define XATTR_NAME_LOV "trusted.lov" -/* remote ACL */ -#define XATTR_NAME_LUSTRE_ACL "system.lustre_acl" +struct lov_mds_md_v3 { /* LOV EA mds/wire data (little-endian) */ + __u32 lmm_magic; /* magic number = LOV_MAGIC_V3 */ + __u32 lmm_pattern; /* LOV_PATTERN_RAID0, LOV_PATTERN_RAID1 */ + __u64 lmm_object_id; /* LOV object ID */ + __u64 lmm_object_gr; /* LOV object group */ + __u32 lmm_stripe_size; /* size of stripe in bytes */ + __u32 lmm_stripe_count; /* num stripes in use for this object */ + char lmm_pool_name[LOV_MAXPOOLNAME]; /* must be 32bit aligned */ + struct lov_ost_data_v1 lmm_objects[0]; /* per-stripe data */ +}; + #define OBD_MD_FLID (0x00000001ULL) /* object ID */ #define OBD_MD_FLATIME (0x00000002ULL) /* access time */ @@ -736,11 +861,11 @@ extern void lustre_swab_lov_mds_md(struct lov_mds_md *llm); #define OBD_MD_FLFLAGS (0x00000800ULL) /* flags word */ #define OBD_MD_FLNLINK (0x00002000ULL) /* link count */ #define OBD_MD_FLGENER (0x00004000ULL) /* generation number */ -#define OBD_MD_FLINLINE (0x00008000ULL) /* inline data */ +/*#define OBD_MD_FLINLINE (0x00008000ULL) inline data. used until 1.6.5 */ #define OBD_MD_FLRDEV (0x00010000ULL) /* device number */ #define OBD_MD_FLEASIZE (0x00020000ULL) /* extended attribute data */ #define OBD_MD_LINKNAME (0x00040000ULL) /* symbolic link target */ -#define OBD_MD_FLHANDLE (0x00080000ULL) /* file handle */ +#define OBD_MD_FLHANDLE (0x00080000ULL) /* file/lock handle */ #define OBD_MD_FLCKSUM (0x00100000ULL) /* bulk data checksum */ #define OBD_MD_FLQOS (0x00200000ULL) /* quality of service stats */ #define OBD_MD_FLOSCOPQ (0x00400000ULL) /* osc opaque data */ @@ -769,22 +894,17 @@ extern void lustre_swab_lov_mds_md(struct lov_mds_md *llm); #define OBD_MD_FLCKSPLIT (0x0000080000000000ULL) /* Check split on server */ #define OBD_MD_FLCROSSREF (0x0000100000000000ULL) /* Cross-ref case */ +#define OBD_MD_FLRMTLSETFACL (0x0001000000000000ULL) /* lfs lsetfacl case */ +#define OBD_MD_FLRMTLGETFACL (0x0002000000000000ULL) /* lfs lgetfacl case */ +#define OBD_MD_FLRMTRSETFACL (0x0004000000000000ULL) /* lfs rsetfacl case */ +#define OBD_MD_FLRMTRGETFACL (0x0008000000000000ULL) /* lfs rgetfacl case */ + #define OBD_MD_FLGETATTR (OBD_MD_FLID | OBD_MD_FLATIME | OBD_MD_FLMTIME | \ OBD_MD_FLCTIME | OBD_MD_FLSIZE | OBD_MD_FLBLKSZ | \ OBD_MD_FLMODE | OBD_MD_FLTYPE | OBD_MD_FLUID | \ OBD_MD_FLGID | OBD_MD_FLFLAGS | OBD_MD_FLNLINK | \ OBD_MD_FLGENER | OBD_MD_FLRDEV | OBD_MD_FLGROUP) -static inline struct lustre_handle *obdo_handle(struct obdo *oa) -{ - return (struct lustre_handle *)oa->o_inline; -} - -static inline struct llog_cookie *obdo_logcookie(struct obdo *oa) -{ - return (struct llog_cookie *)(oa->o_inline + - sizeof(struct lustre_handle)); -} /* don't forget obdo_fid which is way down at the bottom so it can * come after the definition of llog_cookie */ @@ -812,6 +932,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 */ @@ -849,17 +974,18 @@ struct niobuf_remote { extern void lustre_swab_niobuf_remote (struct niobuf_remote *nbr); -/* request structure for OST's */ - -struct ost_body { - struct obdo oa; -}; - -extern void lustre_swab_ost_body (struct ost_body *b); -extern void lustre_swab_ost_last_id(obd_id *id); - /* lock value block communicated between the filter and llite */ +/* OST_LVB_ERR_INIT is needed because the return code in rc is + * negative, i.e. because ((MASK + rc) & MASK) != MASK. */ +#define OST_LVB_ERR_INIT 0xffbadbad80000000ULL +#define OST_LVB_ERR_MASK 0xffbadbad00000000ULL +#define OST_LVB_IS_ERR(blocks) \ + ((blocks & OST_LVB_ERR_MASK) == OST_LVB_ERR_MASK) +#define OST_LVB_SET_ERR(blocks, rc) \ + do { blocks = OST_LVB_ERR_INIT + rc; } while (0) +#define OST_LVB_GET_ERR(blocks) (int)(blocks - OST_LVB_ERR_INIT) + struct ost_lvb { __u64 lvb_size; __u64 lvb_mtime; @@ -893,7 +1019,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 @@ -912,6 +1038,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; @@ -1030,6 +1159,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; @@ -1039,11 +1169,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 { @@ -1072,7 +1204,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 */ }; @@ -1120,10 +1252,13 @@ struct mds_remote_perm { __u32 rp_access_perm; /* MAY_READ/WRITE/EXEC */ }; -/* setxid permissions for mds_setxid_perm.mp_perm */ -#define LUSTRE_SETUID_PERM 0x01 -#define LUSTRE_SETGID_PERM 0x02 -#define LUSTRE_SETGRP_PERM 0x04 +/* permissions for md_perm.mp_perm */ +enum { + CFS_SETUID_PERM = 0x01, + CFS_SETGID_PERM = 0x02, + CFS_SETGRP_PERM = 0x04, + CFS_RMTACL_PERM = 0x08 +}; extern void lustre_swab_mds_remote_perm(struct mds_remote_perm *p); @@ -1145,7 +1280,7 @@ struct mds_rec_setattr { __u32 sa_suppgid; __u32 sa_mode; struct ll_fid sa_fid; - __u64 sa_valid; + __u64 sa_valid; /* MDS_ATTR_* attributes */ __u64 sa_size; __u64 sa_mtime; __u64 sa_atime; @@ -1164,26 +1299,48 @@ 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); -/* Remove this once we declare it in include/linux/fs.h (v21 kernel patch?) */ -#ifndef ATTR_CTIME_SET -#define ATTR_CTIME_SET 0x2000 -#endif +/* + * Attribute flags used in mds_rec_setattr::sa_valid. + * The kernel's #defines for ATTR_* should not be used over the network + * since the client and MDS may run different kernels (see bug 13828) + * Therefore, we should only use MDS_ATTR_* attributes for sa_valid. + */ +#define MDS_ATTR_MODE 0x1ULL /* = 1 */ +#define MDS_ATTR_UID 0x2ULL /* = 2 */ +#define MDS_ATTR_GID 0x4ULL /* = 4 */ +#define MDS_ATTR_SIZE 0x8ULL /* = 8 */ +#define MDS_ATTR_ATIME 0x10ULL /* = 16 */ +#define MDS_ATTR_MTIME 0x20ULL /* = 32 */ +#define MDS_ATTR_CTIME 0x40ULL /* = 64 */ +#define MDS_ATTR_ATIME_SET 0x80ULL /* = 128 */ +#define MDS_ATTR_MTIME_SET 0x100ULL /* = 256 */ +#define MDS_ATTR_FORCE 0x200ULL /* = 512, Not a change, but a change it */ +#define MDS_ATTR_ATTR_FLAG 0x400ULL /* = 1024 */ +#define MDS_ATTR_KILL_SUID 0x800ULL /* = 2048 */ +#define MDS_ATTR_KILL_SGID 0x1000ULL /* = 4096 */ +#define MDS_ATTR_CTIME_SET 0x2000ULL /* = 8192 */ +#define MDS_ATTR_FROM_OPEN 0x4000ULL /* = 16384, called from open path, ie O_TRUNC */ +#define MDS_ATTR_BLOCKS 0x8000ULL /* = 32768 */ #ifndef FMODE_READ #define FMODE_READ 00000001 @@ -1232,12 +1389,15 @@ extern void lustre_swab_mdt_rec_setattr (struct mdt_rec_setattr *sa); #define MAY_VTX_PART (1 << 12) /* full VTX permission check */ #define MAY_VTX_FULL (1 << 13) +/* lfs rgetfacl permission check */ +#define MAY_RGETFACL (1 << 14) 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 { @@ -1280,18 +1440,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); @@ -1324,14 +1487,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; @@ -1355,19 +1522,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; @@ -1396,15 +1567,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 */ @@ -1412,7 +1634,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; @@ -1444,6 +1665,7 @@ enum seq_op { #define LOV_MIN_STRIPE_SIZE 65536 /* maximum PAGE_SIZE (ia64), power of 2 */ #define LOV_MAX_STRIPE_COUNT 160 /* until bug 4424 is fixed */ +#define LOV_V1_INSANE_STRIPE_COUNT 65532 /* maximum stripe count bz13933 */ #define LOV_MAX_UUID_BUFFER_SIZE 8192 /* The size of the buffer the lov/mdc reserves for the @@ -1503,9 +1725,12 @@ typedef enum { LCK_CR = 16, LCK_NL = 32, LCK_GROUP = 64, + LCK_COS = 128, LCK_MAXMODE } ldlm_mode_t; +#define LCK_MODE_NUM 8 + typedef enum { LDLM_PLAIN = 10, LDLM_EXTENT = 11, @@ -1522,6 +1747,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; }; @@ -1659,12 +1890,15 @@ struct cfg_marker { __u32 cm_flags; __u32 cm_vers; /* lustre release version number */ __u32 padding; /* 64 bit align */ - time_t cm_createtime; /*when this record was first created */ - time_t cm_canceltime; /*when this record is no longer valid*/ + __u64 cm_createtime; /*when this record was first created */ + __u64 cm_canceltime; /*when this record is no longer valid*/ char cm_tgtname[MTI_NAME_MAXLEN]; char cm_comment[MTI_NAME_MAXLEN]; }; +extern void lustre_swab_cfg_marker(struct cfg_marker *marker, + int swab, int size); + /* * Opcodes for multiple servers. */ @@ -1679,14 +1913,14 @@ typedef enum { /* catalog of log objects */ -/* Identifier for a single log object */ +/** Identifier for a single log object */ struct llog_logid { __u64 lgl_oid; __u64 lgl_ogr; __u32 lgl_ogen; } __attribute__((packed)); -/* Records written to the CATALOGS list */ +/** Records written to the CATALOGS list */ #define CATLIST "CATALOGS" struct llog_catid { struct llog_logid lci_logid; @@ -1695,7 +1929,7 @@ struct llog_catid { __u32 lci_padding3; } __attribute__((packed)); -/*join file lov mds md*/ +/** join file lov mds md*/ struct lov_mds_md_join { struct lov_mds_md lmmj_md; /*join private info*/ @@ -1732,7 +1966,7 @@ typedef enum { __swab32(LLOG_OP_MAGIC) || \ (((r)->lrh_type == 0) && ((r)->lrh_len > LLOG_CHUNK_SIZE))) -/* Log record header - stored in little endian order. +/** Log record header - stored in little endian order. * Each record must start with this struct, end with a llog_rec_tail, * and be a multiple of 256 bits in size. */ @@ -1759,7 +1993,7 @@ struct llog_logid_rec { struct llog_rec_tail lid_tail; } __attribute__((packed)); -/* MDS extent description +/** MDS extent description * It is for joined file extent info, each extent info for joined file * just like (start, end, lmm). */ @@ -1768,7 +2002,8 @@ struct mds_extent_desc { __u64 med_len; /* extent length */ struct lov_mds_md med_lmm; /* extent's lmm */ }; -/*Joined file array extent log record*/ + +/** Joined file array extent log record*/ struct llog_array_rec { struct llog_rec_hdr lmr_hdr; struct mds_extent_desc lmr_med; @@ -1859,7 +2094,7 @@ struct llog_log_hdr { llh->llh_bitmap_offset - \ sizeof(llh->llh_tail)) * 8) -/* log cookies are used to reference a specific log file and a record therein */ +/** log cookies are used to reference a specific log file and a record therein */ struct llog_cookie { struct llog_logid lgc_lgl; __u32 lgc_subsys; @@ -1867,7 +2102,7 @@ struct llog_cookie { __u32 lgc_padding; } __attribute__((packed)); -/* llog protocol */ +/** llog protocol */ enum llogd_rpc_ops { LLOG_ORIGIN_HANDLE_CREATE = 501, LLOG_ORIGIN_HANDLE_NEXT_BLOCK = 502, @@ -1921,8 +2156,70 @@ struct lov_user_md_join { /* LOV EA user data (host-endian) */ struct lov_user_ost_data_join lmm_objects[0]; /* per-stripe data */ } __attribute__((packed)); -extern void lustre_swab_lov_user_md(struct lov_user_md *lum); -extern void lustre_swab_lov_user_md_objects(struct lov_user_md *lum); +/* Note: 64-bit types are 64-bit aligned in structure */ +struct obdo { + obd_valid o_valid; /* hot fields in this obdo */ + obd_id o_id; + obd_gr o_gr; + obd_id o_fid; + obd_size o_size; /* o_size-o_blocks == ost_lvb */ + obd_time o_mtime; + obd_time o_atime; + obd_time o_ctime; + obd_blocks o_blocks; /* brw: cli sent cached bytes */ + obd_size o_grant; + + /* 32-bit fields start here: keep an even number of them via padding */ + obd_blksize o_blksize; /* optimal IO blocksize */ + obd_mode o_mode; /* brw: cli sent cache remain */ + obd_uid o_uid; + obd_gid o_gid; + obd_flag o_flags; + obd_count o_nlink; /* brw: checksum */ + obd_count o_generation; + obd_count o_misc; /* brw: o_dropped */ + __u32 o_easize; /* epoch in ost writes */ + __u32 o_mds; + __u32 o_stripe_idx; /* holds stripe idx */ + __u32 o_padding_1; + struct lustre_handle o_handle; /* brw: lock handle to prolong locks */ + struct llog_cookie o_lcookie; /* destroy: unlink cookie from MDS */ + + __u64 o_padding_2; + __u64 o_padding_3; + __u64 o_padding_4; + __u64 o_padding_5; + __u64 o_padding_6; +}; + +#define o_dirty o_blocks +#define o_undirty o_mode +#define o_dropped o_misc +#define o_cksum o_nlink + +extern void lustre_swab_obdo (struct obdo *o); + +/* request structure for OST's */ + +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); + +extern void lustre_swab_lov_user_md_v1(struct lov_user_md_v1 *lum); +extern void lustre_swab_lov_user_md_v3(struct lov_user_md_v3 *lum); +extern void lustre_swab_lov_user_md_objects(struct lov_user_ost_data *lod, + int stripe_count); extern void lustre_swab_lov_user_md_join(struct lov_user_md_join *lumj); /* llog_swab.c */ @@ -1965,7 +2262,7 @@ typedef enum { #define JOIN_FILE_ALIGN 4096 -/* security opcodes */ +/** security opcodes */ typedef enum { SEC_CTX_INIT = 801, SEC_CTX_INIT_CONT = 802, @@ -1996,18 +2293,18 @@ struct lustre_capa { extern void lustre_swab_lustre_capa(struct lustre_capa *c); -/* lustre_capa.lc_opc */ +/** lustre_capa::lc_opc */ enum { - CAPA_OPC_BODY_WRITE = 1<<0, /* write object data */ - CAPA_OPC_BODY_READ = 1<<1, /* read object data */ - CAPA_OPC_INDEX_LOOKUP = 1<<2, /* lookup object fid */ - CAPA_OPC_INDEX_INSERT = 1<<3, /* insert object fid */ - CAPA_OPC_INDEX_DELETE = 1<<4, /* delete object fid */ - CAPA_OPC_OSS_WRITE = 1<<5, /* write oss object data */ - CAPA_OPC_OSS_READ = 1<<6, /* read oss object data */ - CAPA_OPC_OSS_TRUNC = 1<<7, /* truncate oss object */ - CAPA_OPC_META_WRITE = 1<<8, /* write object meta data */ - CAPA_OPC_META_READ = 1<<9, /* read object meta data */ + CAPA_OPC_BODY_WRITE = 1<<0, /**< write object data */ + CAPA_OPC_BODY_READ = 1<<1, /**< read object data */ + CAPA_OPC_INDEX_LOOKUP = 1<<2, /**< lookup object fid */ + CAPA_OPC_INDEX_INSERT = 1<<3, /**< insert object fid */ + CAPA_OPC_INDEX_DELETE = 1<<4, /**< delete object fid */ + CAPA_OPC_OSS_WRITE = 1<<5, /**< write oss object data */ + CAPA_OPC_OSS_READ = 1<<6, /**< read oss object data */ + CAPA_OPC_OSS_TRUNC = 1<<7, /**< truncate oss object */ + CAPA_OPC_META_WRITE = 1<<8, /**< write object meta data */ + CAPA_OPC_META_READ = 1<<9, /**< read object meta data */ }; @@ -2035,9 +2332,9 @@ static inline int capa_for_oss(struct lustre_capa *c) return (c->lc_opc & CAPA_OPC_INDEX_LOOKUP) == 0; } -/* lustre_capa.lc_hmac_alg */ +/* lustre_capa::lc_hmac_alg */ enum { - CAPA_HMAC_ALG_SHA1 = 1, /* sha1 algorithm */ + CAPA_HMAC_ALG_SHA1 = 1, /**< sha1 algorithm */ CAPA_HMAC_ALG_MAX, }; @@ -2045,17 +2342,19 @@ enum { #define CAPA_HMAC_ALG_MASK 0xff000000 struct lustre_capa_key { - __u64 lk_mdsid; /* mds# */ - __u32 lk_keyid; /* key# */ + __u64 lk_mdsid; /**< mds# */ + __u32 lk_keyid; /**< key# */ __u32 lk_padding; - __u8 lk_key[CAPA_HMAC_KEY_MAX_LEN]; /* key */ + __u8 lk_key[CAPA_HMAC_KEY_MAX_LEN]; /**< key */ } __attribute__((packed)); extern void lustre_swab_lustre_capa_key(struct lustre_capa_key *k); /* quota check function */ -#define QUOTA_RET_OK 0 /* return successfully */ -#define QUOTA_RET_NOQUOTA 1 /* not support quota */ -#define QUOTA_RET_NOLIMIT 2 /* quota limit isn't set */ -#define QUOTA_RET_ACQUOTA 3 /* need to acquire extra quota */ +#define QUOTA_RET_OK 0 /**< return successfully */ +#define QUOTA_RET_NOQUOTA 1 /**< not support quota */ +#define QUOTA_RET_NOLIMIT 2 /**< quota limit isn't set */ +#define QUOTA_RET_ACQUOTA 3 /**< need to acquire extra quota */ #endif + +/** @} lustreidl */