LU-9679 modules: convert MIN/MAX to kernel style

[fs/lustre-release.git] / lustre / lov / lov_io.c

diff --git a/lustre/lov/lov_io.c b/lustre/lov/lov_io.c
index 464c8f2..e699603 100644 (file)
--- a/lustre/lov/lov_io.c
+++ b/lustre/lov/lov_io.c
@@ -142,6 +142,7 @@ static int lov_io_sub_init(const struct lu_env *env, struct lov_io *lio,
        sub_io->ci_lock_no_expand = io->ci_lock_no_expand;
        sub_io->ci_ndelay = io->ci_ndelay;
        sub_io->ci_layout_version = io->ci_layout_version;
+       sub_io->ci_tried_all_mirrors = io->ci_tried_all_mirrors;
 
        result = cl_io_sub_init(sub->sub_env, sub_io, io->ci_type, sub_obj);
 
@@ -256,8 +257,8 @@ static int lov_io_mirror_write_intent(struct lov_io *lio,
                if (!lu_extent_is_overlapped(ext, lle->lle_extent))
                        continue;
 
-               ext->e_start = MIN(ext->e_start, lle->lle_extent->e_start);
-               ext->e_end = MAX(ext->e_end, lle->lle_extent->e_end);
+               ext->e_start = min(ext->e_start, lle->lle_extent->e_start);
+               ext->e_end = max(ext->e_end, lle->lle_extent->e_end);
                ++count;
        }
        if (count == 0) {
@@ -405,13 +406,13 @@ static int lov_io_mirror_init(struct lov_io *lio, struct lov_object *obj,
                                found = true;
                                break;
                        }
-               }
-
+               } /* each component of the mirror */
                if (found) {
                        index = (index + i) % comp->lo_mirror_count;
                        break;
                }
-       }
+       } /* each mirror */
+
        if (i == comp->lo_mirror_count) {
                CERROR(DFID": failed to find a component covering "
                       "I/O region at %llu\n",
@@ -435,16 +436,22 @@ static int lov_io_mirror_init(struct lov_io *lio, struct lov_object *obj,
         * of this client has been partitioned. We should relinquish CPU for
         * a while before trying again.
         */
-       ++io->ci_ndelay_tried;
-       if (io->ci_ndelay && io->ci_ndelay_tried >= comp->lo_mirror_count) {
+       if (io->ci_ndelay && io->ci_ndelay_tried > 0 &&
+           (io->ci_ndelay_tried % comp->lo_mirror_count == 0)) {
                set_current_state(TASK_INTERRUPTIBLE);
-               schedule_timeout(cfs_time_seconds(1)); /* 10ms */
+               schedule_timeout(cfs_time_seconds(1) / 100); /* 10ms */
                if (signal_pending(current))
                        RETURN(-EINTR);
 
-               /* reset retry counter */
-               io->ci_ndelay_tried = 1;
+               /**
+                * we'd set ci_tried_all_mirrors to turn off fast mirror
+                * switching for read after we've tried all mirrors several
+                * rounds.
+                */
+               io->ci_tried_all_mirrors = io->ci_ndelay_tried %
+                                          (comp->lo_mirror_count * 4) == 0;
        }
+       ++io->ci_ndelay_tried;
 
        CDEBUG(D_VFSTRACE, "use %sdelayed RPC state for this IO\n",
               io->ci_ndelay ? "non-" : "");
@@ -682,6 +689,7 @@ static void lov_io_sub_inherit(struct lov_io_sub *sub, struct lov_io *lio,
        case CIT_READ:
        case CIT_WRITE: {
                io->u.ci_wr.wr_sync = cl_io_is_sync_write(parent);
+               io->ci_tried_all_mirrors = parent->ci_tried_all_mirrors;
                if (cl_io_is_append(parent)) {
                        io->u.ci_wr.wr_append = 1;
                } else {
@@ -1036,7 +1044,8 @@ static int lov_io_read_ahead(const struct lu_env *env,
                              ra);
 
        CDEBUG(D_READA, DFID " cra_end = %lu, stripes = %d, rc = %d\n",
-              PFID(lu_object_fid(lov2lu(loo))), ra->cra_end, r0->lo_nr, rc);
+              PFID(lu_object_fid(lov2lu(loo))), ra->cra_end_idx,
+                   r0->lo_nr, rc);
        if (rc != 0)
                RETURN(rc);
 
@@ -1048,29 +1057,29 @@ static int lov_io_read_ahead(const struct lu_env *env,
         */
 
        /* cra_end is stripe level, convert it into file level */
-       ra_end = ra->cra_end;
+       ra_end = ra->cra_end_idx;
        if (ra_end != CL_PAGE_EOF)
-               ra->cra_end = lov_stripe_pgoff(loo->lo_lsm, index,
-                                              ra_end, stripe);
+               ra->cra_end_idx = lov_stripe_pgoff(loo->lo_lsm, index,
+                                                  ra_end, stripe);
 
        /* boundary of current component */
        ra_end = cl_index(obj, (loff_t)lov_io_extent(lio, index)->e_end);
-       if (ra_end != CL_PAGE_EOF && ra->cra_end >= ra_end)
-               ra->cra_end = ra_end - 1;
+       if (ra_end != CL_PAGE_EOF && ra->cra_end_idx >= ra_end)
+               ra->cra_end_idx = ra_end - 1;
 
        if (r0->lo_nr == 1) /* single stripe file */
                RETURN(0);
 
        pps = lov_lse(loo, index)->lsme_stripe_size >> PAGE_SHIFT;
 
-       CDEBUG(D_READA, DFID " max_index = %lu, pps = %u, index = %u, "
+       CDEBUG(D_READA, DFID " max_index = %lu, pps = %u, index = %d, "
               "stripe_size = %u, stripe no = %u, start index = %lu\n",
-              PFID(lu_object_fid(lov2lu(loo))), ra->cra_end, pps, index,
+              PFID(lu_object_fid(lov2lu(loo))), ra->cra_end_idx, pps, index,
               lov_lse(loo, index)->lsme_stripe_size, stripe, start);
 
        /* never exceed the end of the stripe */
-       ra->cra_end = min_t(pgoff_t,
-                           ra->cra_end, start + pps - start % pps - 1);
+       ra->cra_end_idx = min_t(pgoff_t, ra->cra_end_idx,
+                               start + pps - start % pps - 1);
        RETURN(0);
 }