X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd%2Fosd_internal.h;h=58c2464b7fb61f3a4e58368328d7fcebdf9899ab;hb=319bbea02a0b726a16e7cb5020b3edf0ccd77244;hp=745140f0114fae7e6ca6c6dbbf25df62391ad1f1;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git diff --git a/lustre/osd/osd_internal.h b/lustre/osd/osd_internal.h index 745140f..58c2464 100644 --- a/lustre/osd/osd_internal.h +++ b/lustre/osd/osd_internal.h @@ -16,8 +16,8 @@ * 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 [sun.com URL with a - * copy of GPLv2]. + * 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 @@ -47,13 +47,22 @@ /* struct rw_semaphore */ #include -/* handle_t, journal_start(), journal_stop() */ -#include -/* struct dx_hash_info */ -#include /* struct dentry */ #include -#include +/* struct dirent64 */ +#include + +#ifdef HAVE_EXT4_LDISKFS +#include +#include +#define osd_journal_callback_set(handle, func, jcb) jbd2_journal_callback_set(handle, func, jcb) +#else +#include +#include +#include +#define osd_journal_callback_set(handle, func, jcb) journal_callback_set(handle, func, jcb) +#endif + /* LUSTRE_OSD_NAME */ #include @@ -63,11 +72,21 @@ #include #include "osd_oi.h" +#include "osd_iam.h" struct inode; +#define OSD_OII_NOGEN (0) #define OSD_COUNTERS (0) +#ifdef HAVE_QUOTA_SUPPORT +struct osd_ctxt { + __u32 oc_uid; + __u32 oc_gid; + __u32 oc_cap; +}; +#endif + /* * osd device. */ @@ -82,7 +101,7 @@ struct osd_device { * XXX temporary stuff for object index: directory where every object * is named by its fid. */ - struct dentry *od_obj_area; + struct dt_object *od_obj_area; /* Environment for transaction commit callback. * Currently, OSD is based on ext3/JBD. Transaction commit in ext3/JBD @@ -100,7 +119,7 @@ struct osd_device { __u32 od_capa_alg; struct lustre_capa_key *od_capa_keys; struct hlist_head *od_capa_hash; - + cfs_proc_dir_entry_t *od_proc_entry; struct lprocfs_stats *od_stats; /* @@ -109,42 +128,135 @@ struct osd_device { cfs_time_t od_osfs_age; struct kstatfs od_kstatfs; 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; +}; + +/** + * Storage representation for fids. + * + * Variable size, first byte contains the length of the whole record. + */ +struct osd_fid_pack { + unsigned char fp_len; + char fp_area[sizeof(struct lu_fid)]; +}; + +struct osd_it_ea_dirent { + __u64 oied_ino; + __u64 oied_off; + unsigned short oied_namelen; + unsigned int oied_type; + char oied_name[0]; +} __attribute__((packed)); + +#define OSD_IT_EA_BUFSIZE CFS_PAGE_SIZE + +/** + * This is iterator's in-memory data structure in interoperability + * mode (i.e. iterator over ldiskfs style directory) + */ +struct osd_it_ea { + struct osd_object *oie_obj; + /** used in ldiskfs iterator, to stored file pointer */ + struct file oie_file; + /** how many entries have been read-cached from storage */ + int oie_rd_dirent; + /** current entry is being iterated by caller */ + int oie_it_dirent; + /** current processing entry */ + struct osd_it_ea_dirent *oie_dirent; + /** buffer to hold entries, size == OSD_IT_EA_BUFSIZE */ + void *oie_buf; }; +/** + * Iterator's in-memory data structure for IAM mode. + */ +struct osd_it_iam { + struct osd_object *oi_obj; + struct iam_path_descr *oi_ipd; + struct iam_iterator oi_it; +}; struct osd_thread_info { const struct lu_env *oti_env; + /** + * used for index operations. + */ + struct dentry oti_obj_dentry; + struct dentry oti_child_dentry; + + /** dentry for Iterator context. */ + struct dentry oti_it_dentry; struct lu_fid oti_fid; struct osd_inode_id oti_id; /* * XXX temporary: for ->i_op calls. */ - struct qstr oti_str; struct txn_param oti_txn; + struct timespec oti_time; + struct timespec oti_time2; /* - * XXX temporary: fake dentry used by xattr calls. + * XXX temporary: fake struct file for osd_object_sync */ - struct dentry oti_dentry; - struct timespec oti_time; + struct file oti_file; /* * XXX temporary: for capa operations. */ struct lustre_capa_key oti_capa_key; struct lustre_capa oti_capa; - struct lu_fid_pack oti_pack; + /** + * following ipd and it structures are used for osd_index_iam_lookup() + * these are defined separately as we might do index operation + * in open iterator session. + */ + + /** osd iterator context used for iterator session */ - /* union to guarantee that ->oti_ipd[] has proper alignment. */ union { - char oti_ipd[DX_IPD_MAX_SIZE]; + struct osd_it_iam oti_it; + /** ldiskfs iterator data structure, see osd_it_ea_{init, fini} */ + struct osd_it_ea oti_it_ea; + }; + + /** pre-allocated buffer used by oti_it_ea, size OSD_IT_EA_BUFSIZE */ + void *oti_it_ea_buf; + + /** IAM iterator for index operation. */ + struct iam_iterator oti_idx_it; + + /** union to guarantee that ->oti_ipd[] has proper alignment. */ + union { + char oti_it_ipd[DX_IPD_MAX_SIZE]; long long oti_alignment_lieutenant; }; -#if OSD_COUNTERS + + union { + char oti_idx_ipd[DX_IPD_MAX_SIZE]; + long long oti_alignment_lieutenant_colonel; + }; + + int oti_r_locks; int oti_w_locks; int oti_txns; + /** used in osd_fid_set() to put xattr */ + struct lu_buf oti_buf; + /** used in osd_ea_fid_set() to set fid into common ea */ + struct lustre_mdt_attrs oti_mdt_attrs; +#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_fid_packed[OSD_FID_REC_SZ]; }; #ifdef LPROCFS @@ -159,5 +271,31 @@ void osd_lprocfs_time_end(const struct lu_env *env, int osd_statfs(const struct lu_env *env, struct dt_device *dev, struct kstatfs *sfs); +/* + * Invariants, assertions. + */ + +/* + * XXX: do not enable this, until invariant checking code is made thread safe + * in the face of pdirops locking. + */ +#define OSD_INVARIANT_CHECKS (0) + +#if OSD_INVARIANT_CHECKS +static inline int osd_invariant(const struct osd_object *obj) +{ + return + obj != NULL && + ergo(obj->oo_inode != NULL, + obj->oo_inode->i_sb == osd_sb(osd_obj2dev(obj)) && + atomic_read(&obj->oo_inode->i_count) > 0) && + ergo(obj->oo_dir != NULL && + obj->oo_dir->od_conationer.ic_object != NULL, + obj->oo_dir->od_conationer.ic_object == obj->oo_inode); +} +#else +#define osd_invariant(obj) (1) +#endif + #endif /* __KERNEL__ */ #endif /* _OSD_INTERNAL_H */