X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flov%2Flov_internal.h;h=a6d981f0dd1105ca5684a2103f8d200989d78bbd;hb=9a4644fc9e829c45e883b12a709958bdc98f2411;hp=a8711e022acee70cdf5cc753ed3964260a8eadcc;hpb=d4f89c82b4f8668518635af8cd924ff25bbb5762;p=fs%2Flustre-release.git diff --git a/lustre/lov/lov_internal.h b/lustre/lov/lov_internal.h index a8711e0..a6d981f 100644 --- a/lustre/lov/lov_internal.h +++ b/lustre/lov/lov_internal.h @@ -36,7 +36,7 @@ struct lov_request { }; struct lov_request_set { - struct obd_enqueue_info *set_ei; + struct ldlm_enqueue_info*set_ei; struct obd_info *set_oi; atomic_t set_refcount; struct obd_export *set_exp; @@ -200,9 +200,10 @@ int lov_prep_sync_set(struct obd_export *exp, struct obd_info *obd_info, obd_off end, struct lov_request_set **reqset); int lov_fini_sync_set(struct lov_request_set *set); int lov_prep_enqueue_set(struct obd_export *exp, struct obd_info *oinfo, - struct obd_enqueue_info *einfo, + struct ldlm_enqueue_info *einfo, struct lov_request_set **reqset); -int lov_fini_enqueue_set(struct lov_request_set *set, __u32 mode, int rc); +int lov_fini_enqueue_set(struct lov_request_set *set, __u32 mode, int rc, + struct ptlrpc_request_set *rqset); int lov_prep_match_set(struct obd_export *exp, struct obd_info *oinfo, struct lov_stripe_md *lsm, ldlm_policy_data_t *policy, __u32 mode, @@ -226,7 +227,7 @@ int lov_fini_statfs_set(struct lov_request_set *set); /* lov_obd.c */ void lov_fix_desc(struct lov_desc *desc); -int lov_get_stripecnt(struct lov_obd *lov, int stripe_count); +int lov_get_stripecnt(struct lov_obd *lov, __u32 stripe_count); void lov_getref(struct obd_device *obd); void lov_putref(struct obd_device *obd);