LASSERT(sub->sub_stripe < lio->lis_stripe_count);
ENTRY;
+ if (unlikely(lov_r0(lov)->lo_sub[stripe] == NULL))
+ RETURN(-EIO);
+
result = 0;
sub->sub_io_initialized = 0;
sub->sub_borrowed = 0;
int lov_page_stripe(const struct cl_page *page)
{
- struct lovsub_object *subobj;
const struct cl_page_slice *slice;
ENTRY;
- slice = cl_page_at(page, &lovsub_device_type);
+ slice = cl_page_at(page, &lov_device_type);
LASSERT(slice != NULL);
LASSERT(slice->cpl_obj != NULL);
- subobj = cl2lovsub(slice->cpl_obj);
- RETURN(subobj->lso_index);
+ RETURN(cl2lov_page(slice)->lps_stripe);
}
struct lov_io_sub *lov_page_subio(const struct lu_env *env, struct lov_io *lio,
RETURN(result);
}
-static void lov_io_slice_init(struct lov_io *lio,
- struct lov_object *obj, struct cl_io *io)
+static int lov_io_slice_init(struct lov_io *lio,
+ struct lov_object *obj, struct cl_io *io)
{
ENTRY;
lio->lis_io_endpos = lio->lis_endpos;
if (cl_io_is_append(io)) {
LASSERT(io->ci_type == CIT_WRITE);
+
+ /* If there is LOV EA hole, then we may cannot locate
+ * the current file-tail exactly. */
+ if (unlikely(obj->lo_lsm->lsm_pattern &
+ LOV_PATTERN_F_HOLE))
+ RETURN(-EIO);
+
lio->lis_pos = 0;
lio->lis_endpos = OBD_OBJECT_EOF;
}
LBUG();
}
- EXIT;
+ RETURN(0);
}
static void lov_io_fini(const struct lu_env *env, const struct cl_io_slice *ios)
endpos, &start, &end))
continue;
+ if (unlikely(lov_r0(lio->lis_object)->lo_sub[stripe] == NULL)) {
+ if (ios->cis_io->ci_type == CIT_READ ||
+ ios->cis_io->ci_type == CIT_WRITE ||
+ ios->cis_io->ci_type == CIT_FAULT)
+ RETURN(-EIO);
+
+ continue;
+ }
+
end = lov_offset_mod(end, +1);
sub = lov_sub_get(env, lio, stripe);
if (!IS_ERR(sub)) {
rc = PTR_ERR(sub);
if (!rc)
- cfs_list_add_tail(&sub->sub_linkage, &lio->lis_active);
+ list_add_tail(&sub->sub_linkage, &lio->lis_active);
else
break;
}
int rc = 0;
ENTRY;
- cfs_list_for_each_entry(sub, &lio->lis_active, sub_linkage) {
+ list_for_each_entry(sub, &lio->lis_active, sub_linkage) {
lov_sub_enter(sub);
rc = iofunc(sub->sub_env, sub->sub_io);
lov_sub_exit(sub);
ENTRY;
rc = lov_io_call(env, lio, lov_io_iter_fini_wrapper);
LASSERT(rc == 0);
- while (!cfs_list_empty(&lio->lis_active))
- cfs_list_del_init(lio->lis_active.next);
+ while (!list_empty(&lio->lis_active))
+ list_del_init(lio->lis_active.next);
EXIT;
}
ENTRY;
*written = 0;
- cfs_list_for_each_entry(sub, &lio->lis_active, sub_linkage) {
+ list_for_each_entry(sub, &lio->lis_active, sub_linkage) {
struct cl_io *subio = sub->sub_io;
lov_sub_enter(sub);
ENTRY;
INIT_LIST_HEAD(&lio->lis_active);
- lov_io_slice_init(lio, lov, io);
+ io->ci_result = lov_io_slice_init(lio, lov, io);
+ if (io->ci_result != 0)
+ RETURN(io->ci_result);
+
if (io->ci_result == 0) {
io->ci_result = lov_io_subio_init(env, lio, io);
if (io->ci_result == 0) {