X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fosd-ldiskfs%2Fosd_internal.h;h=af14812599d7c8bee25cdf214e0fe2c7136f44c7;hb=020941416419ab282f3d9b694014b2059d299d51;hp=3925b7af89f7b2349e1f8e65f4a47a5a6ff3db1d;hpb=7c243a561ffe8503a6abf5c4cafef0c3566192bc;p=fs%2Flustre-release.git diff --git a/lustre/osd-ldiskfs/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h index 3925b7a..af14812 100644 --- a/lustre/osd-ldiskfs/osd_internal.h +++ b/lustre/osd-ldiskfs/osd_internal.h @@ -43,7 +43,6 @@ #ifndef _OSD_INTERNAL_H #define _OSD_INTERNAL_H -#if defined(__KERNEL__) /* struct mutex */ #include @@ -53,7 +52,7 @@ #include /* struct dirent64 */ #include - +#include #include #include @@ -146,21 +145,21 @@ struct osd_obj_seq { struct dentry *oos_root; /* O/ */ struct dentry **oos_dirs; /* O//d0-dXX */ obd_seq oos_seq; /* seq number */ - cfs_list_t oos_seq_list; /* list to seq_list */ + struct list_head oos_seq_list; /* list to seq_list */ }; struct osd_obj_map { struct dentry *om_root; /* dentry for /O */ rwlock_t om_seq_list_lock; /* lock for seq_list */ - cfs_list_t om_seq_list; /* list head for seq */ + struct list_head om_seq_list; /* list head for seq */ int om_subdir_count; struct mutex om_dir_init_mutex; }; struct osd_mdobj { struct dentry *om_root; /* AGENT/ */ - obd_seq om_index; /* mdt index */ - cfs_list_t om_list; /* list to omm_list */ + obd_seq om_index; /* mdt index */ + struct list_head om_list; /* list to omm_list */ }; struct osd_mdobj_map { @@ -176,7 +175,7 @@ struct osd_mdobj_map { struct osd_inconsistent_item { /* link into osd_scrub::os_inconsistent_items, * protected by osd_scrub::os_lock. */ - cfs_list_t oii_list; + struct list_head oii_list; /* The right FID <=> ino#/gen mapping. */ struct osd_idmap_cache oii_cache; @@ -243,9 +242,9 @@ struct osd_device { unsigned long od_capa_timeout; __u32 od_capa_alg; struct lustre_capa_key *od_capa_keys; - cfs_hlist_head_t *od_capa_hash; + struct hlist_head *od_capa_hash; - cfs_proc_dir_entry_t *od_proc_entry; + struct proc_dir_entry *od_proc_entry; struct lprocfs_stats *od_stats; spinlock_t od_osfs_lock; @@ -267,7 +266,7 @@ struct osd_device { struct mutex od_otable_mutex; struct osd_otable_it *od_otable_it; struct osd_scrub od_scrub; - cfs_list_t od_ios_list; + struct list_head od_ios_list; /* service name associated with the osd device */ char od_svname[MAX_OBD_NAME]; @@ -313,7 +312,7 @@ struct osd_thandle { struct thandle ot_super; handle_t *ot_handle; struct ldiskfs_journal_cb_entry ot_jcb; - cfs_list_t ot_dcb_list; + struct list_head ot_dcb_list; /* Link to the device, for debugging. */ struct lu_ref_link ot_dev_link; unsigned short ot_credits; @@ -427,7 +426,7 @@ struct osd_it_iam { }; struct osd_quota_leaf { - cfs_list_t oql_link; + struct list_head oql_link; uint oql_blk; }; @@ -445,7 +444,7 @@ struct osd_it_quota { /** 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; + struct list_head oiq_list; }; #define MAX_BLOCKS_PER_PAGE (PAGE_CACHE_SIZE / 512) @@ -550,6 +549,7 @@ struct osd_thread_info { int oti_txns; /** used in osd_fid_set() to put xattr */ struct lu_buf oti_buf; + struct lu_buf oti_big_buf; /** used in osd_ea_fid_set() to set fid into common ea */ union { struct lustre_mdt_attrs oti_mdt_attrs; @@ -707,10 +707,12 @@ loff_t find_tree_dqentry(const struct lu_env *env, 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); + struct lquota_id_info *qi, struct osd_object *obj, + bool enforce, 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); + struct osd_object *obj, bool is_blk, 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); @@ -726,6 +728,28 @@ static inline bool is_quota_glb_feat(const struct dt_index_features *feat) feat == &dt_quota_bgrp_features) ? true : false; } +#ifndef HAVE_I_UID_READ +static inline uid_t i_uid_read(const struct inode *inode) +{ + return inode->i_uid; +} + +static inline gid_t i_gid_read(const struct inode *inode) +{ + return inode->i_gid; +} + +static inline void i_uid_write(struct inode *inode, uid_t uid) +{ + inode->i_uid = uid; +} + +static inline void i_gid_write(struct inode *inode, gid_t gid) +{ + inode->i_gid = gid; +} +#endif + /* * Invariants, assertions. */ @@ -1060,6 +1084,11 @@ static inline int fid_is_internal(const struct lu_fid *fid) return (!fid_is_namespace_visible(fid) && !fid_is_idif(fid)); } +static inline unsigned long osd_remote_parent_ino(struct osd_device *dev) +{ + return dev->od_mdt_map->omm_remote_parent->d_inode->i_ino; +} + #ifdef JOURNAL_START_HAS_3ARGS # define osd_journal_start_sb(sb, type, nblock) \ ldiskfs_journal_start_sb(sb, type, nblock) @@ -1068,7 +1097,9 @@ static inline int fid_is_internal(const struct lu_fid *fid) # define osd_ldiskfs_find_entry(dir, name, de, inlined, lock) \ ldiskfs_find_entry(dir, name, de, inlined, lock) # define osd_journal_start(inode, type, nblocks) \ - ldiskfs_journal_start(inode, type, nblocks); + ldiskfs_journal_start(inode, type, nblocks) +# define osd_transaction_size(dev) \ + (osd_journal(dev)->j_max_transaction_buffers / 2) #else # define LDISKFS_HT_MISC 0 # define osd_journal_start_sb(sb, type, nblock) \ @@ -1078,11 +1109,14 @@ static inline int fid_is_internal(const struct lu_fid *fid) # define osd_ldiskfs_find_entry(dir, name, de, inlined, lock) \ ldiskfs_find_entry(dir, name, de, lock) # define osd_journal_start(inode, type, nblocks) \ - ldiskfs_journal_start(inode, nblocks); + ldiskfs_journal_start(inode, nblocks) +# define osd_transaction_size(dev) \ + (osd_journal(dev)->j_max_transaction_buffers) #endif void ldiskfs_inc_count(handle_t *handle, struct inode *inode); void ldiskfs_dec_count(handle_t *handle, struct inode *inode); -#endif /* __KERNEL__ */ +void osd_fini_iobuf(struct osd_device *d, struct osd_iobuf *iobuf); + #endif /* _OSD_INTERNAL_H */