X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_internal.h;h=a5c681b9eb2a45a7723311545be0ac3c0ad9bca2;hb=c65a2c2a41f4fb9b91f25d4ac073364258691d1b;hp=4f12506d9a90dc5b8a78884768294f88cc6c1f0a;hpb=46e82c4644108eac92ac7c813c16bd7dd3283a56;p=fs%2Flustre-release.git diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h index 4f12506..a5c681b 100644 --- a/lustre/ofd/ofd_internal.h +++ b/lustre/ofd/ofd_internal.h @@ -27,7 +27,7 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2013, Intel Corporation. + * Copyright (c) 2012, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -42,7 +42,6 @@ #include #include #include -#include #define OFD_INIT_OBJID 0 #define OFD_PRECREATE_BATCH_DEFAULT (OBJ_SUBDIR_COUNT * 4) @@ -58,15 +57,15 @@ /* per-client-per-object persistent state (LRU) */ struct ofd_mod_data { - cfs_list_t fmd_list; /* linked to fed_mod_list */ - struct lu_fid fmd_fid; /* FID being written to */ - __u64 fmd_mactime_xid; /* xid highest {m,a,c}time setattr */ - cfs_time_t fmd_expire; /* time when the fmd should expire */ - int fmd_refcount; /* reference counter - list holds 1 */ + struct list_head fmd_list; /* linked to fed_mod_list */ + struct lu_fid fmd_fid; /* FID being written to */ + __u64 fmd_mactime_xid; /* xid highest {m,a,c}time setattr */ + cfs_time_t fmd_expire; /* time when the fmd should expire */ + int fmd_refcount; /* reference counter - list holds 1 */ }; #define OFD_FMD_MAX_NUM_DEFAULT 128 -#define OFD_FMD_MAX_AGE_DEFAULT ((obd_timeout + 10) * HZ) +#define OFD_FMD_MAX_AGE_DEFAULT msecs_to_jiffies((obd_timeout+10)*MSEC_PER_SEC) #define OFD_SOFT_SYNC_LIMIT_DEFAULT 16 @@ -105,7 +104,7 @@ static inline void ofd_counter_incr(struct obd_export *exp, int opcode, } struct ofd_seq { - cfs_list_t os_list; + struct list_head os_list; struct ost_id os_oi; spinlock_t os_last_oid_lock; struct mutex os_create_lock; @@ -130,7 +129,7 @@ struct ofd_device { __u64 ofd_inconsistency_self_detected; __u64 ofd_inconsistency_self_repaired; - cfs_list_t ofd_seq_list; + struct list_head ofd_seq_list; rwlock_t ofd_seq_list_lock; int ofd_seq_count; int ofd_precreate_batch; @@ -143,24 +142,24 @@ struct ofd_device { __u64 ofd_osfs_age; int ofd_blockbits; /* writes which might be be accounted twice in ofd_osfs.os_bavail */ - obd_size ofd_osfs_unstable; + u64 ofd_osfs_unstable; /* counters used during statfs update, protected by ofd_osfs_lock. * record when some statfs refresh are in progress */ int ofd_statfs_inflight; /* track writes completed while statfs refresh is underway. * tracking is only effective when ofd_statfs_inflight > 1 */ - obd_size ofd_osfs_inflight; + u64 ofd_osfs_inflight; /* grants: all values in bytes */ /* grant lock to protect all grant counters */ spinlock_t ofd_grant_lock; /* total amount of dirty data reported by clients in incoming obdo */ - obd_size ofd_tot_dirty; + u64 ofd_tot_dirty; /* sum of filesystem space granted to clients for async writes */ - obd_size ofd_tot_granted; + u64 ofd_tot_granted; /* grant used by I/Os in progress (between prepare and commit) */ - obd_size ofd_tot_pending; + u64 ofd_tot_pending; /* free space threshold over which we stop granting space to clients * ofd_grant_ratio is stored as a fixed-point fraction using * OFD_GRANT_RATIO_SHIFT of the remaining free space, not in percentage @@ -253,13 +252,6 @@ static inline struct ofd_device *ofd_obj2dev(const struct ofd_object *fo) return ofd_dev(fo->ofo_obj.do_lu.lo_dev); } -static inline struct lustre_capa *ofd_object_capa(const struct lu_env *env, - const struct ofd_object *obj) -{ - /* TODO: see mdd_object_capa() */ - return BYPASS_CAPA; -} - static inline void ofd_read_lock(const struct lu_env *env, struct ofd_object *fo) { @@ -333,17 +325,11 @@ struct ofd_thread_info { extern void target_recovery_fini(struct obd_device *obd); extern void target_recovery_init(struct lu_target *lut, svc_handler_t handler); -/* ofd_capa.c */ -int ofd_update_capa_key(struct ofd_device *ofd, struct lustre_capa_key *key); -int ofd_auth_capa(struct obd_export *exp, const struct lu_fid *fid, - obd_seq seq, struct lustre_capa *capa, __u64 opc); -void ofd_free_capa_keys(struct ofd_device *ofd); - /* ofd_dev.c */ extern struct lu_context_key ofd_thread_key; int ofd_postrecov(const struct lu_env *env, struct ofd_device *ofd); int ofd_fiemap_get(const struct lu_env *env, struct ofd_device *ofd, - struct lu_fid *fid, struct ll_user_fiemap *fiemap); + struct lu_fid *fid, struct fiemap *fiemap); /* ofd_obd.c */ extern struct obd_ops ofd_obd_ops; @@ -357,12 +343,12 @@ int ofd_statfs(const struct lu_env *env, struct obd_export *exp, int ofd_obd_disconnect(struct obd_export *exp); /* ofd_fs.c */ -obd_id ofd_seq_last_oid(struct ofd_seq *oseq); -void ofd_seq_last_oid_set(struct ofd_seq *oseq, obd_id id); +u64 ofd_seq_last_oid(struct ofd_seq *oseq); +void ofd_seq_last_oid_set(struct ofd_seq *oseq, u64 id); int ofd_seq_last_oid_write(const struct lu_env *env, struct ofd_device *ofd, struct ofd_seq *oseq); int ofd_seqs_init(const struct lu_env *env, struct ofd_device *ofd); -struct ofd_seq *ofd_seq_get(struct ofd_device *ofd, obd_seq seq); +struct ofd_seq *ofd_seq_get(struct ofd_device *ofd, u64 seq); void ofd_seq_put(const struct lu_env *env, struct ofd_seq *oseq); int ofd_fs_setup(const struct lu_env *env, struct ofd_device *ofd, @@ -370,7 +356,7 @@ int ofd_fs_setup(const struct lu_env *env, struct ofd_device *ofd, void ofd_fs_cleanup(const struct lu_env *env, struct ofd_device *ofd); int ofd_precreate_batch(struct ofd_device *ofd, int batch); struct ofd_seq *ofd_seq_load(const struct lu_env *env, struct ofd_device *ofd, - obd_seq seq); + u64 seq); void ofd_seqs_fini(const struct lu_env *env, struct ofd_device *ofd); void ofd_seqs_free(const struct lu_env *env, struct ofd_device *ofd); @@ -382,13 +368,11 @@ int ofd_verify_ff(const struct lu_env *env, struct ofd_object *fo, int ofd_preprw(const struct lu_env *env,int cmd, struct obd_export *exp, struct obdo *oa, int objcount, struct obd_ioobj *obj, struct niobuf_remote *rnb, int *nr_local, - struct niobuf_local *lnb, struct obd_trans_info *oti, - struct lustre_capa *capa); + struct niobuf_local *lnb); int ofd_commitrw(const struct lu_env *env, int cmd, struct obd_export *exp, struct obdo *oa, int objcount, struct obd_ioobj *obj, struct niobuf_remote *rnb, int npages, - struct niobuf_local *lnb, struct obd_trans_info *oti, - int old_rc); + struct niobuf_local *lnb, int old_rc); /* ofd_trans.c */ struct thandle *ofd_trans_create(const struct lu_env *env, @@ -402,14 +386,10 @@ int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn, void *cookie); /* lproc_ofd.c */ -#ifdef LPROCFS -void lprocfs_ofd_init_vars(struct lprocfs_static_vars *lvars); +#ifdef CONFIG_PROC_FS +extern struct lprocfs_vars lprocfs_ofd_obd_vars[]; void ofd_stats_counter_init(struct lprocfs_stats *stats); #else -static void lprocfs_ofd_init_vars(struct lprocfs_static_vars *lvars) -{ - memset(lvars, 0, sizeof(*lvars)); -} static inline void ofd_stats_counter_init(struct lprocfs_stats *stats) {} #endif @@ -419,7 +399,7 @@ struct ofd_object *ofd_object_find(const struct lu_env *env, const struct lu_fid *fid); int ofd_object_ff_load(const struct lu_env *env, struct ofd_object *fo); int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd, - obd_id id, struct ofd_seq *oseq, int nr, int sync); + u64 id, struct ofd_seq *oseq, int nr, int sync); void ofd_object_put(const struct lu_env *env, struct ofd_object *fo); int ofd_attr_set(const struct lu_env *env, struct ofd_object *fo, @@ -450,7 +430,7 @@ struct ofd_object *ofd_object_find_exists(const struct lu_env *env, /* ofd_grants.c */ #define OFD_GRANT_RATIO_SHIFT 8 -static inline __u64 ofd_grant_reserved(struct ofd_device *ofd, obd_size bavail) +static inline u64 ofd_grant_reserved(struct ofd_device *ofd, u64 bavail) { return (bavail * ofd->ofd_grant_ratio) >> OFD_GRANT_RATIO_SHIFT; } @@ -492,7 +472,7 @@ static inline int ofd_grant_prohibit(struct obd_export *exp, void ofd_grant_sanity_check(struct obd_device *obd, const char *func); long ofd_grant_connect(const struct lu_env *env, struct obd_export *exp, - obd_size want, bool conservative); + u64 want, bool new_conn); void ofd_grant_discard(struct obd_export *exp); void ofd_grant_prepare_read(const struct lu_env *env, struct obd_export *exp, struct obdo *oa); @@ -582,20 +562,6 @@ static inline struct ofd_thread_info *tsi2ofd_info(struct tgt_session_info *tsi) return info; } -static inline void ofd_oti2info(struct ofd_thread_info *info, - struct obd_trans_info *oti) -{ - info->fti_xid = oti->oti_xid; - info->fti_pre_version = oti->oti_pre_version; -} - -static inline void ofd_info2oti(struct ofd_thread_info *info, - struct obd_trans_info *oti) -{ - oti->oti_xid = info->fti_xid; - oti->oti_pre_version = info->fti_pre_version; -} - /* sync on lock cancel is useless when we force a journal flush, * and if we enable async journal commit, we should also turn on * sync on lock cancel if it is not enabled already. */ @@ -620,12 +586,4 @@ static inline void ofd_prepare_fidea(struct filter_fid *ff, ff->ff_parent.f_ver = cpu_to_le32(oa->o_stripe_idx); } -/* niobuf_remote has no rnb_ prefix in master */ -#define rnb_offset offset -#define rnb_flags flags -#define rnb_len len -/* the same for niobuf_local */ -#define lnb_flags flags -#define lnb_rc rc - #endif /* _OFD_INTERNAL_H */