X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flustre%2Flustre_user.h;h=06ea33e1f5181aba702ce202b99c871a093f9931;hp=a8b5a5c91875fd41b888fb9a878538e5b5a6a7c7;hb=942a9ad2fb230abe2290ae08aad748b5a58c9148;hpb=3056f3ec0a513408b76494ea4bb26fd888d952b5 diff --git a/lustre/include/lustre/lustre_user.h b/lustre/include/lustre/lustre_user.h index a8b5a5c..06ea33e 100644 --- a/lustre/include/lustre/lustre_user.h +++ b/lustre/include/lustre/lustre_user.h @@ -26,7 +26,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -41,6 +41,11 @@ #ifndef _LUSTRE_USER_H #define _LUSTRE_USER_H +/** \defgroup lustreuser lustreuser + * + * @{ + */ + #include #if defined(__linux__) #include @@ -117,12 +122,12 @@ struct obd_statfs { #define LL_IOC_LOV_GETSTRIPE _IOW ('f', 155, long) #define LL_IOC_LOV_SETEA _IOW ('f', 156, long) #define LL_IOC_RECREATE_OBJ _IOW ('f', 157, long) +#define LL_IOC_RECREATE_FID _IOW ('f', 157, struct lu_fid) #define LL_IOC_GROUP_LOCK _IOW ('f', 158, long) #define LL_IOC_GROUP_UNLOCK _IOW ('f', 159, long) #define LL_IOC_QUOTACHECK _IOW ('f', 160, int) #define LL_IOC_POLL_QUOTACHECK _IOR ('f', 161, struct if_quotacheck *) #define LL_IOC_QUOTACTL _IOWR('f', 162, struct if_quotactl *) -#define LL_IOC_JOIN _IOW ('f', 163, long) #define IOC_OBD_STATFS _IOWR('f', 164, struct obd_statfs *) #define IOC_LOV_GETINFO _IOWR('f', 165, struct lov_user_mds_data *) #define LL_IOC_FLUSHCTX _IOW ('f', 166, long) @@ -135,6 +140,10 @@ struct obd_statfs { #define LL_IOC_LLOOP_INFO _IOWR('f', 171, long) #define LL_IOC_LLOOP_DETACH_BYDEV _IOWR('f', 172, long) #define LL_IOC_PATH2FID _IOR ('f', 173, long) +#define LL_IOC_GET_CONNECT_FLAGS _IOWR('f', 174, __u64 *) +#define LL_IOC_GET_MDTIDX _IOR ('f', 175, int) + +#define LL_IOC_HSM_CT_START _IOW ('f', 178, struct lustre_kernelcomm *) #define LL_STATFS_MDC 1 #define LL_STATFS_LOV 2 @@ -158,7 +167,7 @@ struct obd_statfs { #define LOV_USER_MAGIC_V1 0x0BD10BD0 #define LOV_USER_MAGIC LOV_USER_MAGIC_V1 -#define LOV_USER_MAGIC_JOIN 0x0BD20BD0 +#define LOV_USER_MAGIC_JOIN_V1 0x0BD20BD0 #define LOV_USER_MAGIC_V3 0x0BD30BD0 #define LOV_PATTERN_RAID0 0x001 @@ -171,7 +180,7 @@ struct obd_statfs { #define lov_user_ost_data lov_user_ost_data_v1 struct lov_user_ost_data_v1 { /* per-stripe data structure */ __u64 l_object_id; /* OST object ID */ - __u64 l_object_gr; /* OST object group (creating MDS number) */ + __u64 l_object_seq; /* OST object seq number */ __u32 l_ost_gen; /* generation of this OST index */ __u32 l_ost_idx; /* OST index in LOV */ } __attribute__((packed)); @@ -181,7 +190,7 @@ struct lov_user_md_v1 { /* LOV EA user data (host-endian) */ __u32 lmm_magic; /* magic number = LOV_USER_MAGIC_V1 */ __u32 lmm_pattern; /* LOV_PATTERN_RAID0, LOV_PATTERN_RAID1 */ __u64 lmm_object_id; /* LOV object ID */ - __u64 lmm_object_gr; /* LOV object group */ + __u64 lmm_object_seq; /* LOV object seq */ __u32 lmm_stripe_size; /* size of stripe in bytes */ __u16 lmm_stripe_count; /* num stripes in use for this object */ __u16 lmm_stripe_offset; /* starting stripe offset in lmm_objects */ @@ -192,7 +201,7 @@ struct lov_user_md_v3 { /* LOV EA user data (host-endian) */ __u32 lmm_magic; /* magic number = LOV_USER_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 */ + __u64 lmm_object_seq; /* LOV object seq */ __u32 lmm_stripe_size; /* size of stripe in bytes */ __u16 lmm_stripe_count; /* num stripes in use for this object */ __u16 lmm_stripe_offset; /* starting stripe offset in lmm_objects */ @@ -218,7 +227,6 @@ struct lov_user_mds_data_v3 { struct ll_recreate_obj { __u64 lrc_id; - __u64 lrc_group; __u32 lrc_ost_idx; }; @@ -229,12 +237,6 @@ struct ll_fid { * OST for saving into EA. */ }; -struct filter_fid { - struct ll_fid ff_fid; /* ff_fid.f_type == file stripe number */ - __u64 ff_objid; - __u64 ff_group; -}; - struct obd_uuid { char uuid[40]; }; @@ -307,6 +309,12 @@ struct lu_fid { __u32 f_ver; }; +struct filter_fid { + struct lu_fid ff_parent; /* ff_parent.f_ver == file stripe number */ + __u64 ff_objid; + __u64 ff_seq; +}; + /* Userspace should treat lu_fid as opaque, and only use the following methods to print or parse them. Other functions (e.g. compare, swab) could be moved here from lustre_idl.h if needed. */ @@ -322,7 +330,11 @@ typedef struct lu_fid lustre_fid; /* scanf input parse format -- strip '[' first. e.g. sscanf(fidstr, SFID, RFID(&fid)); */ -#define SFID "0x%llx:0x%x:0x%x" +/* #define SFID "0x"LPX64i":0x"LPSZX":0x"LPSZX"" +liblustreapi.c:2893: warning: format '%lx' expects type 'long unsigned int *', but argument 4 has type 'unsigned int *' +liblustreapi.c:2893: warning: format '%lx' expects type 'long unsigned int *', but argument 5 has type 'unsigned int *' +*/ +#define SFID "0x"LPX64i":0x%x:0x%x" #define RFID(fid) \ &((fid)->f_seq), \ &((fid)->f_oid), \ @@ -343,8 +355,6 @@ typedef struct lu_fid lustre_fid; #define LUSTRE_Q_FINVALIDATE 0x80000c /* invalidate filter quota data */ #define UGQUOTA 2 /* set both USRQUOTA and GRPQUOTA */ -#define IMMQUOTA 0x4 /* set immutable quota flag, cannot be turned on/off - * on-fly. temporary used by SOM */ struct if_quotacheck { char obd_type[16]; @@ -386,18 +396,6 @@ enum { }; #ifdef NEED_QUOTA_DEFS -#ifndef QUOTABLOCK_BITS -#define QUOTABLOCK_BITS 10 -#endif - -#ifndef QUOTABLOCK_SIZE -#define QUOTABLOCK_SIZE (1 << QUOTABLOCK_BITS) -#endif - -#ifndef toqb -#define toqb(x) (((x) + QUOTABLOCK_SIZE - 1) >> QUOTABLOCK_BITS) -#endif - #ifndef QIF_BLIMITS #define QIF_BLIMITS 1 #define QIF_SPACE 2 @@ -480,6 +478,7 @@ enum changelog_rec_type { CL_SETATTR = 14, CL_XATTR = 15, CL_HSM = 16, /* HSM specific events, see flags */ + CL_TIME = 17, /* mtime, atime, ctime change only */ CL_LAST }; @@ -487,7 +486,7 @@ static inline const char *changelog_type2str(int type) { static const char *changelog_str[] = { "MARK", "CREAT", "MKDIR", "HLINK", "SLINK", "MKNOD", "UNLNK", "RMDIR", "RNMFM", "RNMTO", "OPEN", "CLOSE", "IOCTL", "TRUNC", - "SATTR", "XATTR", "HSM" }; + "SATTR", "XATTR", "HSM", "TIME" }; if (type >= 0 && type < CL_LAST) return changelog_str[type]; return NULL; @@ -498,6 +497,7 @@ static inline const char *changelog_type2str(int type) { #define CLF_FLAGMASK 0x0FFF /* Anything under the flagmask may be per-type (if desired) */ +#define CR_MAXSIZE (PATH_MAX + sizeof(struct changelog_rec)) struct changelog_rec { __u16 cr_namelen; __u16 cr_flags; /**< (flags&CLF_FLAGMASK)|CLF_VERSION */ @@ -513,12 +513,17 @@ struct changelog_rec { char cr_name[0]; /**< last element */ } __attribute__((packed)); -struct ioc_changelog_clear { +struct ioc_changelog { + __u64 icc_recno; __u32 icc_mdtindex; __u32 icc_id; - __u64 icc_recno; + __u32 icc_flags; }; +enum changelog_message_type { + CL_RECORD = 10, /* message is a changelog_rec */ + CL_EOF = 11, /* at end of current changelog */ +}; /********* Misc **********/ @@ -530,6 +535,11 @@ struct ioc_changelog_clear { /********* HSM **********/ + + +#define HSM_FLAGS_MASK 0 + + enum hsm_message_type { HMT_ACTION_LIST = 100, /* message is a hsm_action_list */ }; @@ -580,14 +590,16 @@ struct hsm_action_list { static __inline__ struct hsm_action_item * hai_zero(struct hsm_action_list *hal) { return (struct hsm_action_item *)(hal->hal_fsname + - size_round(strlen(hal->hal_fsname))); + cfs_size_round(strlen(hal-> \ + hal_fsname))); } /* Return pointer to next hai */ static __inline__ struct hsm_action_item * hai_next(struct hsm_action_item *hai) { return (struct hsm_action_item *)((char *)hai + - size_round(hai->hai_len)); + cfs_size_round(hai->hai_len)); } +/** @} lustreuser */ #endif /* _LUSTRE_USER_H */