X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosp%2Fosp_internal.h;h=2f08aaa820af41b5bbb2342ae8291ff460200434;hb=d0ba82e44038b2658bbd1a06d52641fda9fc1fe7;hp=d405176cdb35bb9ca4ace91c2e25698d15e112e8;hpb=0209add4a5099817111c8576afe930d1e2daef03;p=fs%2Flustre-release.git diff --git a/lustre/osp/osp_internal.h b/lustre/osp/osp_internal.h index d405176..2f08aaa 100644 --- a/lustre/osp/osp_internal.h +++ b/lustre/osp/osp_internal.h @@ -59,12 +59,12 @@ struct osp_id_tracker { /* callback is register once per diskfs -- that's the whole point */ struct dt_txn_callback otr_tx_cb; /* single node can run many clusters */ - cfs_list_t otr_wakeup_list; - cfs_list_t otr_list; + struct list_head otr_wakeup_list; + struct list_head otr_list; /* underlying shared device */ struct dt_device *otr_dev; /* how many users of this tracker */ - cfs_atomic_t otr_refcount; + atomic_t otr_refcount; }; struct osp_precreate { @@ -154,7 +154,7 @@ struct osp_device { struct ptlrpc_thread opd_syn_thread; wait_queue_head_t opd_syn_waitq; /* list of remotely committed rpc */ - cfs_list_t opd_syn_committed_there; + struct list_head opd_syn_committed_there; /* number of changes being under sync */ int opd_syn_sync_in_progress; /* number of RPCs in flight - flow control */ @@ -173,7 +173,10 @@ struct osp_device { /* last processed (taken from llog) id */ unsigned long opd_syn_last_processed_id; struct osp_id_tracker *opd_syn_tracker; - cfs_list_t opd_syn_ontrack; + struct list_head opd_syn_ontrack; + /* stop processing new requests until barrier=0 */ + atomic_t opd_syn_barrier; + wait_queue_head_t opd_syn_barrier_waitq; /* * statfs related fields: OSP maintains it on its own @@ -195,7 +198,6 @@ struct osp_device { struct dt_update_request *opd_async_requests; /* Protect current operations on opd_async_requests. */ struct mutex opd_async_requests_mutex; - struct semaphore opd_async_fc_sem; }; #define opd_pre_lock opd_pre->osp_pre_lock @@ -237,7 +239,6 @@ struct osp_object { struct dt_object opo_obj; unsigned int opo_reserved:1, opo_new:1, - opo_empty:1, opo_non_exist:1; /* read/write lock for md osp object */ @@ -275,6 +276,22 @@ struct osp_thread_info { struct obdo osi_obdo; }; +/* Iterator for OSP */ +struct osp_it { + __u32 ooi_pos_page; + __u32 ooi_pos_lu_page; + int ooi_pos_ent; + int ooi_total_npages; + int ooi_valid_npages; + unsigned int ooi_swab:1; + __u64 ooi_next; + struct dt_object *ooi_obj; + void *ooi_ent; + struct page *ooi_cur_page; + struct lu_idxpage *ooi_cur_idxpage; + struct page **ooi_pages; +}; + /* The transaction only include the updates on the remote node, and * no local updates at all */ static inline bool is_only_remote_trans(struct thandle *th) @@ -394,9 +411,34 @@ static inline struct seq_server_site *osp_seq_site(struct osp_device *osp) #define osp_get_rpc_lock(lck, it) mdc_get_rpc_lock(lck, it) #define osp_put_rpc_lock(lck, it) mdc_put_rpc_lock(lck, it) +static inline int osp_fid_diff(const struct lu_fid *fid1, + const struct lu_fid *fid2) +{ + /* In 2.6+ ost_idx is packed into IDIF FID, while in 2.4 and 2.5 IDIF + * is always FID_SEQ_IDIF(0x100000000ULL), which does not include OST + * index in the seq. So we can not compare IDIF FID seq here */ + if (fid_is_idif(fid1) && fid_is_idif(fid2)) { + __u32 ost_idx1 = fid_idif_ost_idx(fid1); + __u32 ost_idx2 = fid_idif_ost_idx(fid2); + + LASSERTF(ost_idx1 == 0 || ost_idx2 == 0 || ost_idx1 == ost_idx2, + "fid1: "DFID", fid2: "DFID"\n", PFID(fid1), + PFID(fid2)); + + return fid_idif_id(fid1->f_seq, fid1->f_oid, 0) - + fid_idif_id(fid2->f_seq, fid2->f_oid, 0); + } + + LASSERTF(fid_seq(fid1) == fid_seq(fid2), "fid1:"DFID + ", fid2:"DFID"\n", PFID(fid1), PFID(fid2)); + + return fid_oid(fid1) - fid_oid(fid2); +} + + static inline void osp_update_last_fid(struct osp_device *d, struct lu_fid *fid) { - int diff = lu_fid_diff(fid, &d->opd_last_used_fid); + int diff = osp_fid_diff(fid, &d->opd_last_used_fid); /* * we might have lost precreated objects due to VBR and precreate * orphans, the gap in objid can be calculated properly only here @@ -454,6 +496,7 @@ static inline int osp_is_fid_client(struct osp_device *osp) typedef int (*osp_async_update_interpterer_t)(const struct lu_env *env, struct object_update_reply *reply, + struct ptlrpc_request *req, struct osp_object *obj, void *data, int index, int rc); @@ -489,6 +532,12 @@ int osp_declare_xattr_set(const struct lu_env *env, struct dt_object *dt, int osp_xattr_set(const struct lu_env *env, struct dt_object *dt, const struct lu_buf *buf, const char *name, int fl, struct thandle *th, struct lustre_capa *capa); +int osp_declare_xattr_del(const struct lu_env *env, struct dt_object *dt, + const char *name, struct thandle *th); +int osp_xattr_del(const struct lu_env *env, struct dt_object *dt, + const char *name, struct thandle *th, + struct lustre_capa *capa); + int osp_declare_object_destroy(const struct lu_env *env, struct dt_object *dt, struct thandle *th); int osp_object_destroy(const struct lu_env *env, struct dt_object *dt, @@ -497,6 +546,16 @@ int osp_object_destroy(const struct lu_env *env, struct dt_object *dt, int osp_trans_stop(const struct lu_env *env, struct dt_device *dt, struct thandle *th); +struct dt_it *osp_it_init(const struct lu_env *env, struct dt_object *dt, + __u32 attr, struct lustre_capa *capa); +void osp_it_fini(const struct lu_env *env, struct dt_it *di); +int osp_it_get(const struct lu_env *env, struct dt_it *di, + const struct dt_key *key); +void osp_it_put(const struct lu_env *env, struct dt_it *di); +__u64 osp_it_store(const struct lu_env *env, const struct dt_it *di); +int osp_it_key_rec(const struct lu_env *env, const struct dt_it *di, + void *key_rec); +int osp_it_next_page(const struct lu_env *env, struct dt_it *di); /* osp_md_object.c */ int osp_md_declare_object_create(const struct lu_env *env, struct dt_object *dt, @@ -512,6 +571,7 @@ int osp_md_declare_attr_set(const struct lu_env *env, struct dt_object *dt, int osp_md_attr_set(const struct lu_env *env, struct dt_object *dt, const struct lu_attr *attr, struct thandle *th, struct lustre_capa *capa); +extern const struct dt_index_operations osp_md_index_ops; /* osp_precreate.c */ int osp_init_precreate(struct osp_device *d); @@ -529,7 +589,6 @@ int osp_write_last_oid_seq_files(struct lu_env *env, struct osp_device *osp, int osp_init_pre_fid(struct osp_device *osp); /* lproc_osp.c */ -void lprocfs_osp_init_vars(struct lprocfs_static_vars *lvars); void osp_lprocfs_init(struct osp_device *osp); /* osp_sync.c */ @@ -543,7 +602,6 @@ int osp_sync_fini(struct osp_device *d); void __osp_sync_check_for_work(struct osp_device *d); /* lwp_dev.c */ -void lprocfs_lwp_init_vars(struct lprocfs_static_vars *lvars); extern struct obd_ops lwp_obd_device_ops; extern struct lu_device_type lwp_device_type;