diff options
Diffstat (limited to 'drivers/staging/lustre/lustre/lov/lov_lock.c')
-rw-r--r-- | drivers/staging/lustre/lustre/lov/lov_lock.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/lustre/lustre/lov/lov_lock.c b/drivers/staging/lustre/lustre/lov/lov_lock.c index 08ac3745f0da..49e694222ac8 100644 --- a/drivers/staging/lustre/lustre/lov/lov_lock.c +++ b/drivers/staging/lustre/lustre/lov/lov_lock.c @@ -290,10 +290,10 @@ static int lov_lock_sub_init(const struct lu_env *env, int result = 0; int i; int nr; - obd_off start; - obd_off end; - obd_off file_start; - obd_off file_end; + u64 start; + u64 end; + u64 file_start; + u64 file_end; struct lov_object *loo = cl2lov(lck->lls_cl.cls_obj); struct lov_layout_raid0 *r0 = lov_r0(loo); @@ -860,10 +860,10 @@ static int lock_lock_multi_match() struct lov_layout_raid0 *r0 = lov_r0(loo); struct lov_lock_sub *sub; struct cl_object *subobj; - obd_off fstart; - obd_off fend; - obd_off start; - obd_off end; + u64 fstart; + u64 fend; + u64 start; + u64 end; int i; fstart = cl_offset(need->cld_obj, need->cld_start); @@ -900,8 +900,8 @@ static int lov_lock_stripe_is_matching(const struct lu_env *env, const struct cl_lock_descr *descr) { struct lov_stripe_md *lsm = lov->lo_lsm; - obd_off start; - obd_off end; + u64 start; + u64 end; int result; if (lov_r0(lov)->lo_nr == 1) @@ -919,8 +919,8 @@ static int lov_lock_stripe_is_matching(const struct lu_env *env, stripe == lov_stripe_number(lsm, end); if (result) { struct cl_lock_descr *subd = &lov_env_info(env)->lti_ldescr; - obd_off sub_start; - obd_off sub_end; + u64 sub_start; + u64 sub_end; subd->cld_obj = NULL; /* don't need sub object at all */ subd->cld_mode = descr->cld_mode; |