X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_internal.h;h=f01412d1e444c436ac4ad4564bdea51d8da3260b;hp=59b88f3513ecf6c0a9b4ba80204b5988fdaea9b0;hb=94b6f0980fecb1ee08049e0f1da544e4c99f3fc3;hpb=d01d4c697a3c4423587159d58da6e455a5a3551f diff --git a/lustre/osd-ldiskfs/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h index 59b88f3..f01412d 100644 --- a/lustre/osd-ldiskfs/osd_internal.h +++ b/lustre/osd-ldiskfs/osd_internal.h @@ -89,14 +89,6 @@ struct inode; /** Enable thandle usage statistics */ #define OSD_THANDLE_STATS (0) -#ifdef HAVE_QUOTA_SUPPORT -struct osd_ctxt { - __u32 oc_uid; - __u32 oc_gid; - cfs_kernel_cap_t oc_cap; -}; -#endif - struct osd_directory { struct iam_container od_container; struct iam_descr od_descr; @@ -255,7 +247,6 @@ struct osd_device { /* super-class */ struct dt_device od_dt_dev; /* information about underlying file system */ - struct lustre_mount_info *od_mount; struct vfsmount *od_mnt; /* object index */ struct osd_oi **od_oi_table; @@ -264,7 +255,8 @@ struct osd_device { /* * Fid Capability */ - unsigned int od_fl_capa:1; + unsigned int od_fl_capa:1, + od_is_md:1; /* set in ->ldo_prepare */ unsigned long od_capa_timeout; __u32 od_capa_alg; struct lustre_capa_key *od_capa_keys; @@ -279,13 +271,12 @@ struct osd_device { struct obd_statfs od_statfs; cfs_spinlock_t od_osfs_lock; - /** - * The following flag indicates, if it is interop mode or not. - * It will be initialized, using mount param. - */ - __u32 od_iop_mode; + unsigned int od_iop_mode:1, + od_noscrub:1; struct fsfilt_operations *od_fsops; + int od_connects; + struct lu_site od_site; /* * mapping for legacy OST objids @@ -353,6 +344,7 @@ struct osd_thandle { unsigned short ot_id_cnt; unsigned short ot_id_type; uid_t ot_id_array[OSD_MAX_UGID_CNT]; + struct lquota_trans *ot_quota_trans; #ifdef OSD_TRACK_DECLARES unsigned char ot_declare_attr_set; @@ -473,17 +465,26 @@ struct osd_it_iam { struct iam_iterator oi_it; }; +struct osd_quota_leaf { + cfs_list_t oql_link; + uint oql_blk; +}; + /** * Iterator's in-memory data structure for quota file. */ struct osd_it_quota { struct osd_object *oiq_obj; /** tree blocks path to where the entry is stored */ - uint oiq_blk[LUSTRE_DQTREEDEPTH]; + uint oiq_blk[LUSTRE_DQTREEDEPTH + 1]; /** on-disk offset for current key where quota record can be found */ loff_t oiq_offset; /** identifier for current quota record */ __u64 oiq_id; + /** the record index in the leaf/index block */ + uint oiq_index[LUSTRE_DQTREEDEPTH + 1]; + /** list of already processed leaf blocks */ + cfs_list_t oiq_list; }; #define MAX_BLOCKS_PER_PAGE (CFS_PAGE_SIZE / 512) @@ -503,6 +504,7 @@ struct osd_iobuf { unsigned long dr_start_time; unsigned long dr_elapsed; /* how long io took */ struct osd_device *dr_dev; + unsigned int dr_init_at; /* the line iobuf was initialized */ }; struct osd_thread_info { @@ -589,9 +591,6 @@ struct osd_thread_info { struct osd_iobuf oti_iobuf; struct inode oti_inode; int oti_created[PTLRPC_MAX_BRW_PAGES]; -#ifdef HAVE_QUOTA_SUPPORT - struct osd_ctxt oti_ctxt; -#endif struct lu_env oti_obj_delete_tx_env; #define OSD_FID_REC_SZ 32 char oti_ldp[OSD_FID_REC_SZ]; @@ -602,6 +601,10 @@ struct osd_thread_info { struct if_dqblk oti_dqblk; struct if_dqinfo oti_dqinfo; }; + struct lquota_id_info oti_qi; + struct lquota_trans oti_quota_trans; + union lquota_rec oti_quota_rec; + __u64 oti_quota_id; }; extern int ldiskfs_pdo; @@ -621,8 +624,6 @@ int osd_statfs(const struct lu_env *env, struct dt_device *dev, struct obd_statfs *sfs); int osd_object_auth(const struct lu_env *env, struct dt_object *dt, struct lustre_capa *capa, __u64 opc); -void osd_declare_qid(struct dt_object *dt, struct osd_thandle *oh, - int type, uid_t id, struct inode *inode); struct inode *osd_iget(struct osd_thread_info *info, struct osd_device *dev, struct osd_inode_id *id); struct inode *osd_iget_fid(struct osd_thread_info *info, struct osd_device *dev, @@ -670,6 +671,27 @@ loff_t find_tree_dqentry(const struct lu_env *env, struct osd_object *obj, int type, qid_t dqid, uint blk, int depth, struct osd_it_quota *it); +/* osd_quota.c */ +int osd_declare_qid(const struct lu_env *env, struct osd_thandle *oh, + struct lquota_id_info *qi, bool allocated, int *flags); +int osd_declare_inode_qid(const struct lu_env *env, qid_t uid, qid_t gid, + long long space, struct osd_thandle *oh, + bool is_blk, bool allocated, int *flags, bool force); +const struct dt_rec *osd_quota_pack(struct osd_object *obj, + const struct dt_rec *rec, + union lquota_rec *quota_rec); +void osd_quota_unpack(struct osd_object *obj, const struct dt_rec *rec); +int osd_quota_migration(const struct lu_env *env, struct dt_object *dt, + const struct dt_index_features *feat); + +static inline bool is_quota_glb_feat(const struct dt_index_features *feat) +{ + return (feat == &dt_quota_iusr_features || + feat == &dt_quota_busr_features || + feat == &dt_quota_igrp_features || + feat == &dt_quota_bgrp_features) ? true : false; +} + /* * Invariants, assertions. */ @@ -696,6 +718,8 @@ static inline int osd_invariant(const struct osd_object *obj) #define osd_invariant(obj) (1) #endif +#define OSD_MAX_CACHE_SIZE OBD_OBJECT_EOF + extern const struct dt_index_operations osd_otable_ops; static inline int osd_oi_fid2idx(struct osd_device *dev, @@ -741,7 +765,7 @@ static inline struct osd_device *osd_obj2dev(const struct osd_object *o) static inline struct super_block *osd_sb(const struct osd_device *dev) { - return dev->od_mount->lmi_mnt->mnt_sb; + return dev->od_mnt->mnt_sb; } static inline int osd_object_is_root(const struct osd_object *obj) @@ -808,7 +832,7 @@ static inline void osd_ipd_put(const struct lu_env *env, int osd_ldiskfs_read(struct inode *inode, void *buf, int size, loff_t *offs); int osd_ldiskfs_write_record(struct inode *inode, void *buf, int bufsize, - loff_t *offs, handle_t *handle); + int write_NUL, loff_t *offs, handle_t *handle); static inline struct dentry *osd_child_dentry_by_inode(const struct lu_env *env, @@ -867,5 +891,24 @@ extern const struct dt_index_operations osd_acct_index_ops; int osd_acct_obj_lookup(struct osd_thread_info *info, struct osd_device *osd, const struct lu_fid *fid, struct osd_inode_id *id); +/* copy from fs/ext4/dir.c */ +static inline int is_32bit_api(void) +{ +#ifdef CONFIG_COMPAT + return is_compat_task(); +#else + return (BITS_PER_LONG == 32); +#endif +} + +static inline loff_t ldiskfs_get_htree_eof(struct file *filp) +{ + if ((filp->f_mode & FMODE_32BITHASH) || + (!(filp->f_mode & FMODE_64BITHASH) && is_32bit_api())) + return LDISKFS_HTREE_EOF_32BIT; + else + return LDISKFS_HTREE_EOF_64BIT; +} + #endif /* __KERNEL__ */ #endif /* _OSD_INTERNAL_H */