X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_internal.h;h=4e19b20cb76c32ae7577dcd8a884686cf5686287;hb=a046e879fcadd601c9a19fd906f82ecbd2d4efd5;hp=4d9656e77cf4a96d84fd07b65182a73921e2c3d3;hpb=aa096c486589129a7bc20f9b8c31803e56c4b82f;p=fs%2Flustre-release.git diff --git a/lustre/osd-zfs/osd_internal.h b/lustre/osd-zfs/osd_internal.h index 4d9656e..4e19b20 100644 --- a/lustre/osd-zfs/osd_internal.h +++ b/lustre/osd-zfs/osd_internal.h @@ -74,6 +74,9 @@ #undef kmem_cache_free #endif +#define ZFS_VERSION_CODE \ + OBD_OCD_VERSION(ZFS_MAJOR, ZFS_MINOR, ZFS_PATCH, ZFS_FIX) + #define LUSTRE_ROOT_FID_SEQ 0 #define DMU_OSD_SVNAME "svname" #define DMU_OSD_OI_NAME_BASE "oi" @@ -152,6 +155,9 @@ struct osa_attr { uint64_t mode; uint64_t gid; uint64_t uid; +#ifdef ZFS_PROJINHERIT + uint64_t projid; +#endif uint64_t nlink; uint64_t rdev; uint64_t flags; @@ -173,8 +179,8 @@ struct osd_idmap_cache { oic_remote:1; /* FID isn't local */ }; -/* max.number of regular attrubites the callers may ask for */ -#define OSD_MAX_IN_BULK 13 +/* max.number of regular attributes the callers may ask for */ +# define OSD_MAX_IN_BULK (sizeof(struct osa_attr)/sizeof(uint64_t)) struct osd_thread_info { const struct lu_env *oti_env; @@ -210,6 +216,7 @@ struct osd_thread_info { struct osd_idmap_cache *oti_ins_cache; int oti_ins_cache_size; int oti_ins_cache_used; + struct lu_buf oti_xattr_lbuf; }; extern struct lu_context_key osd_key; @@ -225,7 +232,6 @@ struct osd_thandle { struct list_head ot_stop_dcb_list; struct list_head ot_unlinked_list; struct list_head ot_sa_list; - struct semaphore ot_sa_lock; dmu_tx_t *ot_tx; struct lquota_trans ot_quota_trans; __u32 ot_write_commit:1, @@ -287,6 +293,7 @@ struct osd_device { od_xattr_in_sa:1, od_is_ost:1, od_posix_acl:1; + unsigned int od_dnsize; char od_mntdev[128]; char od_svname[128]; @@ -294,11 +301,11 @@ struct osd_device { int od_connects; struct lu_site od_site; - /* object IDs of the inode accounting indexes */ - uint64_t od_iusr_oid; - uint64_t od_igrp_oid; - dnode_t *od_groupused_dn; - dnode_t *od_userused_dn; + dnode_t *od_groupused_dn; + dnode_t *od_userused_dn; +#ifdef ZFS_PROJINHERIT + dnode_t *od_projectused_dn; +#endif /* quota slave instance */ struct qsd_instance *od_quota_slave; @@ -333,7 +340,7 @@ struct osd_object { * inode is pinned for the whole duration of lu_object life. * * Not modified concurrently (either setup early during object - * creation, or assigned by osd_object_create() under write lock). + * creation, or assigned by osd_create() under write lock). */ dnode_t *oo_dn; sa_handle_t *oo_sa_hdl; @@ -358,7 +365,12 @@ struct osd_object { uint64_t oo_xattr; enum osd_destroy_type oo_destroy; - __u32 oo_destroyed:1; + __u32 oo_destroyed:1, + oo_late_xattr:1, +#ifdef ZFS_PROJINHERIT + oo_with_projid:1, +#endif + oo_late_attr_set:1; /* the i_flags in LMA */ __u32 oo_lma_flags; @@ -370,18 +382,18 @@ struct osd_object { unsigned char oo_recsize; unsigned char oo_recusize; /* unit size */ }; + uint64_t oo_parent; /* used only at object creation */ }; }; int osd_statfs(const struct lu_env *, struct dt_device *, struct obd_statfs *); extern const struct dt_index_operations osd_acct_index_ops; -dnode_t *osd_quota_fid2dmu(const struct osd_device *, const struct lu_fid *fid); extern struct lu_device_operations osd_lu_ops; extern struct dt_index_operations osd_dir_ops; int osd_declare_quota(const struct lu_env *env, struct osd_device *osd, - qid_t uid, qid_t gid, long long space, - struct osd_thandle *oh, bool is_blk, int *flags, - bool force); + qid_t uid, qid_t gid, qid_t projid, long long space, + struct osd_thandle *oh, int *flags, + enum osd_qid_declare_flags osd_qid_declare_flags); uint64_t osd_objs_count_estimate(uint64_t refdbytes, uint64_t usedobjs, uint64_t nrblocks, uint64_t est_maxblockshift); int osd_unlinked_object_free(const struct lu_env *env, struct osd_device *osd, @@ -488,8 +500,11 @@ int osd_procfs_fini(struct osd_device *osd); /* osd_object.c */ extern char *osd_obj_tag; -void osd_object_sa_dirty_rele(struct osd_thandle *oh); int __osd_obj2dnode(objset_t *os, uint64_t oid, dnode_t **dnp); +void osd_object_sa_dirty_rele(const struct lu_env *env, struct osd_thandle *oh); +void osd_object_sa_dirty_add(struct osd_object *obj, struct osd_thandle *oh); +int __osd_obj2dbuf(const struct lu_env *env, objset_t *os, + uint64_t oid, dmu_buf_t **dbp); struct lu_object *osd_object_alloc(const struct lu_env *env, const struct lu_object_header *hdr, struct lu_device *d); @@ -497,12 +512,12 @@ int osd_object_sa_update(struct osd_object *obj, sa_attr_type_t type, void *buf, uint32_t buflen, struct osd_thandle *oh); int __osd_zap_create(const struct lu_env *env, struct osd_device *osd, dnode_t **zap_dnp, dmu_tx_t *tx, struct lu_attr *la, - zap_flags_t flags); + unsigned dnsize, zap_flags_t flags); int __osd_object_create(const struct lu_env *env, struct osd_object *obj, dnode_t **dnp, dmu_tx_t *tx, struct lu_attr *la); int __osd_attr_init(const struct lu_env *env, struct osd_device *osd, - sa_handle_t *sa_hdl, dmu_tx_t *tx, - struct lu_attr *la, uint64_t parent); + struct osd_object *obj, sa_handle_t *sa_hdl, dmu_tx_t *tx, + struct lu_attr *la, uint64_t parent, nvlist_t *); /* osd_oi.c */ int osd_oi_init(const struct lu_env *env, struct osd_device *o); @@ -539,7 +554,15 @@ int osd_remote_fid(const struct lu_env *env, struct osd_device *osd, const struct lu_fid *fid); /* osd_xattr.c */ -int __osd_xattr_load(struct osd_device *osd, sa_handle_t *hdl, nvlist_t **sa); +int __osd_sa_xattr_schedule_update(const struct lu_env *env, + struct osd_object *obj, + struct osd_thandle *oh); +int __osd_sa_attr_init(const struct lu_env *env, struct osd_object *obj, + struct osd_thandle *oh); +int __osd_sa_xattr_update(const struct lu_env *env, struct osd_object *obj, + struct osd_thandle *oh); +int __osd_xattr_load(struct osd_device *osd, sa_handle_t *hdl, + nvlist_t **sa); int __osd_xattr_get_large(const struct lu_env *env, struct osd_device *osd, uint64_t xattr, struct lu_buf *buf, const char *name, int *sizep); @@ -598,6 +621,9 @@ static inline uint64_t attrs_fs2zfs(const uint32_t flags) { return (flags & LUSTRE_APPEND_FL ? ZFS_APPENDONLY : 0) | (flags & LUSTRE_NODUMP_FL ? ZFS_NODUMP : 0) | +#ifdef ZFS_PROJINHERIT + (flags & LUSTRE_PROJINHERIT_FL ? ZFS_PROJINHERIT : 0) | +#endif (flags & LUSTRE_IMMUTABLE_FL ? ZFS_IMMUTABLE : 0); } @@ -605,6 +631,9 @@ static inline uint32_t attrs_zfs2fs(const uint64_t flags) { return (flags & ZFS_APPENDONLY ? LUSTRE_APPEND_FL : 0) | (flags & ZFS_NODUMP ? LUSTRE_NODUMP_FL : 0) | +#ifdef ZFS_PROJINHERIT + (flags & ZFS_PROJINHERIT ? LUSTRE_PROJINHERIT_FL : 0) | +#endif (flags & ZFS_IMMUTABLE ? LUSTRE_IMMUTABLE_FL : 0); } @@ -757,18 +786,17 @@ static inline void osd_dnode_rele(dnode_t *dn) #ifdef HAVE_DMU_USEROBJ_ACCOUNTING -#define OSD_DMU_USEROBJ_PREFIX DMU_OBJACCT_PREFIX +#define OSD_DMU_USEROBJ_PREFIX DMU_OBJACCT_PREFIX +#define OSD_DMU_USEROBJ_PREFIX_LEN DMU_OBJACCT_PREFIX_LEN static inline bool osd_dmu_userobj_accounting_available(struct osd_device *osd) { - if (unlikely(dmu_objset_userobjspace_upgradable(osd->od_os))) - dmu_objset_userobjspace_upgrade(osd->od_os); - return dmu_objset_userobjspace_present(osd->od_os); } #else -#define OSD_DMU_USEROBJ_PREFIX "obj-" +#define OSD_DMU_USEROBJ_PREFIX "obj-" +#define OSD_DMU_USEROBJ_PREFIX_LEN 4 static inline bool osd_dmu_userobj_accounting_available(struct osd_device *osd) { @@ -865,4 +893,20 @@ static inline int osd_dmu_read(struct osd_device *osd, dnode_t *dn, #endif } +#ifdef HAVE_DMU_OBJSET_OWN_6ARG +#define osd_dmu_objset_own(name, type, ronly, decrypt, tag, os) \ + dmu_objset_own((name), (type), (ronly), (decrypt), (tag), (os)) +#else +#define osd_dmu_objset_own(name, type, ronly, decrypt, tag, os) \ + dmu_objset_own((name), (type), (ronly), (tag), (os)) +#endif + +#ifdef HAVE_DMU_OBJSET_DISOWN_3ARG +#define osd_dmu_objset_disown(os, decrypt, tag) \ + dmu_objset_disown((os), (decrypt), (tag)) +#else +#define osd_dmu_objset_disown(os, decrypt, tag) \ + dmu_objset_disown((os), (tag)) +#endif + #endif /* _OSD_INTERNAL_H */