X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flustre%2Flustre_idl.h;h=6b2bf7c9b4124dcba13cad347cd0421c0484b2bd;hp=3eadc05f45afd21c2212bae30ecfd35624322b09;hb=fd908da9;hpb=b0cd8cd9ffb2f067319d2069fe4652e987b59265 diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h index 3eadc05..6b2bf7c 100644 --- a/lustre/include/lustre/lustre_idl.h +++ b/lustre/include/lustre/lustre_idl.h @@ -251,7 +251,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,6 +299,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)); } +#ifdef __KERNEL__ /* * Storage representation for fids. * @@ -289,7 +313,7 @@ struct lu_fid_pack { void fid_pack(struct lu_fid_pack *pack, const struct lu_fid *fid, struct lu_fid *befider); -void fid_unpack(const struct lu_fid_pack *pack, struct lu_fid *fid); +int fid_unpack(const struct lu_fid_pack *pack, struct lu_fid *fid); /* __KERNEL__ */ #endif @@ -447,9 +471,8 @@ struct ptlrpc_body { __u32 pb_conn_cnt; __u32 pb_padding_1; __u32 pb_padding_2; - __u32 pb_padding_3; - __u32 pb_padding_4; - __u32 pb_padding_5; + __u32 pb_limit; + __u64 pb_slv; }; extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb); @@ -523,11 +546,21 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb); #define OBD_CONNECT_CANCELSET 0x00400000ULL /* Early batched cancels. */ #define OBD_CONNECT_SOM 0x00800000ULL /* SOM feature */ #define OBD_CONNECT_AT 0x01000000ULL /* client uses adaptive timeouts */ -#define OBD_CONNECT_MDS_MDS 0x02000000ULL /* MDS-MDS connection*/ -#define OBD_CONNECT_REAL 0x00000200ULL /* real connection */ +#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_FID 0x10000000ULL /* FID is supported by server */ +#define OBD_CONNECT_CKSUM 0x20000000ULL /* support several cksum algos */ + /* 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 | \ @@ -535,14 +568,18 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb); OBD_CONNECT_LCL_CLIENT | \ OBD_CONNECT_RMT_CLIENT | \ OBD_CONNECT_MDS_CAPA | OBD_CONNECT_OSS_CAPA | \ - OBD_CONNECT_MDS_MDS | OBD_CONNECT_CANCELSET) + OBD_CONNECT_MDS_MDS | OBD_CONNECT_CANCELSET | \ + OBD_CONNECT_FID | \ + LRU_RESIZE_CONNECT_FLAG) #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_OSS_CAPA | OBD_CONNECT_CANCELSET | \ + OBD_CONNECT_FID | \ + LRU_RESIZE_CONNECT_FLAG) #define ECHO_CONNECT_SUPPORTED (0) -#define MGS_CONNECT_SUPPORTED (OBD_CONNECT_VERSION) +#define MGS_CONNECT_SUPPORTED (OBD_CONNECT_VERSION | OBD_CONNECT_FID) #define MAX_QUOTA_COUNT32 (0xffffffffULL) @@ -553,9 +590,6 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb); #define OBD_OCD_VERSION_PATCH(version) ((int)((version)>>8)&255) #define OBD_OCD_VERSION_FIX(version) ((int)(version)&255) -#define exp_connect_cancelset(exp) \ - ((exp) ? (exp)->exp_connect_flags & OBD_CONNECT_CANCELSET : 0) - /* This structure is used for both request and reply. * * If we eventually have separate connect data for different types, which we @@ -691,6 +725,9 @@ extern void lustre_swab_obdo (struct obdo *o); #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 */ @@ -719,9 +756,6 @@ 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" - #define OBD_MD_FLID (0x00000001ULL) /* object ID */ #define OBD_MD_FLATIME (0x00000002ULL) /* access time */ #define OBD_MD_FLMTIME (0x00000004ULL) /* data modification time */ @@ -769,6 +803,11 @@ 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 | \ @@ -860,6 +899,16 @@ 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 +942,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 +961,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 +1082,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 +1092,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 { @@ -1120,10 +1175,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 +1203,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 +1222,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,6 +1312,8 @@ 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, @@ -1280,18 +1362,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 +1409,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 +1444,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 +1489,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_padding_4; + __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 +1556,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 +1587,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 @@ -1614,10 +1758,18 @@ typedef enum { MGS_EXCEPTION, /* node died, etc. */ MGS_TARGET_REG, /* whenever target starts up */ MGS_TARGET_DEL, + MGS_SET_INFO, MGS_LAST_OPC } mgs_cmd_t; #define MGS_FIRST_OPC MGS_CONNECT +#define MGS_PARAM_MAXLEN 1024 +#define KEY_SET_INFO "set_info" + +struct mgs_send_param { + char mgs_param[MGS_PARAM_MAXLEN]; +}; + /* We pass this info to the MGS so it can write config logs */ #define MTI_NAME_MAXLEN 64 #define MTI_PARAM_MAXLEN 4096 @@ -1975,13 +2127,14 @@ typedef enum { /* NB take care when changing the sequence of elements this struct, * because the offset info is used in find_capa() */ struct lustre_capa { - struct lu_fid lc_fid; /* fid */ - __u64 lc_opc; /* operations allowed */ - __u32 lc_uid; /* uid, this is legacy and for OSS only */ - __u32 lc_flags; /* HMAC algorithm & flags */ - __u32 lc_keyid; /* key used for the capability */ - __u32 lc_timeout; /* capa timeout value (sec) */ - __u64 lc_expiry; /* expiry time (sec) */ + struct lu_fid lc_fid; /* fid */ + __u64 lc_opc; /* operations allowed */ + __u32 lc_uid; /* uid, it is obsolete, but maybe used in + * future, reserve it for 64-bits aligned.*/ + __u32 lc_flags; /* HMAC algorithm & flags */ + __u32 lc_keyid; /* key used for the capability */ + __u32 lc_timeout; /* capa timeout value (sec) */ + __u64 lc_expiry; /* expiry time (sec) */ __u8 lc_hmac[CAPA_HMAC_MAX_LEN]; /* HMAC */ } __attribute__((packed));