diff options
Diffstat (limited to 'drivers/staging/lustre/lustre/fld')
-rw-r--r-- | drivers/staging/lustre/lustre/fld/fld_cache.c | 17 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/fld/fld_internal.h | 2 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/fld/fld_request.c | 25 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/fld/lproc_fld.c | 1 |
4 files changed, 22 insertions, 23 deletions
diff --git a/drivers/staging/lustre/lustre/fld/fld_cache.c b/drivers/staging/lustre/lustre/fld/fld_cache.c index 759a233a7028..5d95d0b358b8 100644 --- a/drivers/staging/lustre/lustre/fld/fld_cache.c +++ b/drivers/staging/lustre/lustre/fld/fld_cache.c @@ -54,7 +54,6 @@ #include "../include/lprocfs_status.h" #include "../include/dt_object.h" -#include "../include/md_object.h" #include "../include/lustre_req_layout.h" #include "../include/lustre_fld.h" #include "fld_internal.h" @@ -263,8 +262,8 @@ void fld_cache_punch_hole(struct fld_cache *cache, struct fld_cache_entry *f_new) { const struct lu_seq_range *range = &f_new->fce_range; - const seqno_t new_start = range->lsr_start; - const seqno_t new_end = range->lsr_end; + const u64 new_start = range->lsr_start; + const u64 new_end = range->lsr_end; struct fld_cache_entry *fldt; OBD_ALLOC_GFP(fldt, sizeof(*fldt), GFP_ATOMIC); @@ -302,9 +301,9 @@ static void fld_cache_overlap_handle(struct fld_cache *cache, struct fld_cache_entry *f_new) { const struct lu_seq_range *range = &f_new->fce_range; - const seqno_t new_start = range->lsr_start; - const seqno_t new_end = range->lsr_end; - const mdsno_t mdt = range->lsr_index; + const u64 new_start = range->lsr_start; + const u64 new_end = range->lsr_end; + const u32 mdt = range->lsr_index; /* this is overlap case, these case are checking overlapping with * prev range only. fixup will handle overlapping with next range. */ @@ -386,8 +385,8 @@ int fld_cache_insert_nolock(struct fld_cache *cache, struct fld_cache_entry *n; struct list_head *head; struct list_head *prev = NULL; - const seqno_t new_start = f_new->fce_range.lsr_start; - const seqno_t new_end = f_new->fce_range.lsr_end; + const u64 new_start = f_new->fce_range.lsr_start; + const u64 new_end = f_new->fce_range.lsr_end; __u32 new_flags = f_new->fce_range.lsr_flags; /* @@ -516,7 +515,7 @@ struct fld_cache_entry * lookup \a seq sequence for range in fld cache. */ int fld_cache_lookup(struct fld_cache *cache, - const seqno_t seq, struct lu_seq_range *range) + const u64 seq, struct lu_seq_range *range) { struct fld_cache_entry *flde; struct fld_cache_entry *prev = NULL; diff --git a/drivers/staging/lustre/lustre/fld/fld_internal.h b/drivers/staging/lustre/lustre/fld/fld_internal.h index 5da0c1da0d39..8806b6096953 100644 --- a/drivers/staging/lustre/lustre/fld/fld_internal.h +++ b/drivers/staging/lustre/lustre/fld/fld_internal.h @@ -167,7 +167,7 @@ void fld_cache_delete(struct fld_cache *cache, void fld_cache_delete_nolock(struct fld_cache *cache, const struct lu_seq_range *range); int fld_cache_lookup(struct fld_cache *cache, - const seqno_t seq, struct lu_seq_range *range); + const u64 seq, struct lu_seq_range *range); struct fld_cache_entry* fld_cache_entry_lookup(struct fld_cache *cache, struct lu_seq_range *range); diff --git a/drivers/staging/lustre/lustre/fld/fld_request.c b/drivers/staging/lustre/lustre/fld/fld_request.c index 8e512f9c3db0..0d361ff43212 100644 --- a/drivers/staging/lustre/lustre/fld/fld_request.c +++ b/drivers/staging/lustre/lustre/fld/fld_request.c @@ -53,7 +53,6 @@ #include "../include/lprocfs_status.h" #include "../include/dt_object.h" -#include "../include/md_object.h" #include "../include/lustre_req_layout.h" #include "../include/lustre_fld.h" #include "../include/lustre_mdc.h" @@ -110,15 +109,14 @@ static void fld_exit_request(struct client_obd *cli) client_obd_list_unlock(&cli->cl_loi_list_lock); } -static int fld_rrb_hash(struct lu_client_fld *fld, - seqno_t seq) +static int fld_rrb_hash(struct lu_client_fld *fld, u64 seq) { LASSERT(fld->lcf_count > 0); return do_div(seq, fld->lcf_count); } static struct lu_fld_target * -fld_rrb_scan(struct lu_client_fld *fld, seqno_t seq) +fld_rrb_scan(struct lu_client_fld *fld, u64 seq) { struct lu_fld_target *target; int hash; @@ -173,7 +171,7 @@ struct lu_fld_hash fld_hash[] = { }; static struct lu_fld_target * -fld_client_get_target(struct lu_client_fld *fld, seqno_t seq) +fld_client_get_target(struct lu_client_fld *fld, u64 seq) { struct lu_fld_target *target; @@ -294,7 +292,7 @@ static int fld_client_proc_init(struct lu_client_fld *fld) if (rc) { CERROR("%s: Can't init FLD proc, rc %d\n", fld->lcf_name, rc); - GOTO(out_cleanup, rc); + goto out_cleanup; } return 0; @@ -364,12 +362,12 @@ int fld_client_init(struct lu_client_fld *fld, if (IS_ERR(fld->lcf_cache)) { rc = PTR_ERR(fld->lcf_cache); fld->lcf_cache = NULL; - GOTO(out, rc); + goto out; } rc = fld_client_proc_init(fld); if (rc) - GOTO(out, rc); + goto out; out: if (rc) fld_client_fini(fld); @@ -428,6 +426,7 @@ int fld_client_rpc(struct obd_export *exp, ptlrpc_request_set_replen(req); req->rq_request_portal = FLD_REQUEST_PORTAL; + req->rq_reply_portal = MDC_REPLY_PORTAL; ptlrpc_at_set_req_timeout(req); if (fld_op == FLD_LOOKUP && @@ -442,18 +441,20 @@ int fld_client_rpc(struct obd_export *exp, if (fld_op != FLD_LOOKUP) mdc_put_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL); if (rc) - GOTO(out_req, rc); + goto out_req; prange = req_capsule_server_get(&req->rq_pill, &RMF_FLD_MDFLD); - if (prange == NULL) - GOTO(out_req, rc = -EFAULT); + if (prange == NULL) { + rc = -EFAULT; + goto out_req; + } *range = *prange; out_req: ptlrpc_req_finished(req); return rc; } -int fld_client_lookup(struct lu_client_fld *fld, seqno_t seq, mdsno_t *mds, +int fld_client_lookup(struct lu_client_fld *fld, u64 seq, u32 *mds, __u32 flags, const struct lu_env *env) { struct lu_seq_range res = { 0 }; diff --git a/drivers/staging/lustre/lustre/fld/lproc_fld.c b/drivers/staging/lustre/lustre/fld/lproc_fld.c index 7f6bcc63c5eb..95e7de18d2f1 100644 --- a/drivers/staging/lustre/lustre/fld/lproc_fld.c +++ b/drivers/staging/lustre/lustre/fld/lproc_fld.c @@ -49,7 +49,6 @@ #include "../include/obd.h" #include "../include/obd_class.h" #include "../include/dt_object.h" -#include "../include/md_object.h" #include "../include/obd_support.h" #include "../include/lustre_req_layout.h" #include "../include/lustre_fld.h" |