LU-6025 utils: reset optind before calls to getopt_long()

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

diff --git a/lustre/lov/lov_page.c b/lustre/lov/lov_page.c
index e5b3221..35e1d1a 100644 (file)
--- a/lustre/lov/lov_page.c
+++ b/lustre/lov/lov_page.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -53,17 +53,65 @@
  *
  */
 
-static int lov_page_print(const struct lu_env *env,
-                          const struct cl_page_slice *slice,
-                          void *cookie, lu_printer_t printer)
+/**
+ * Adjust the stripe index by layout of raid0. @max_index is the maximum
+ * page index covered by an underlying DLM lock.
+ * This function converts max_index from stripe level to file level, and make
+ * sure it's not beyond one stripe.
+ */
+static int lov_raid0_page_is_under_lock(const struct lu_env *env,
+                                       const struct cl_page_slice *slice,
+                                       struct cl_io *unused,
+                                       pgoff_t *max_index)
 {
-        struct lov_page *lp = cl2lov_page(slice);
+       struct lov_object *loo = cl2lov(slice->cpl_obj);
+       struct lov_layout_raid0 *r0 = lov_r0(loo);
+       pgoff_t index = *max_index;
+       unsigned int pps; /* pages per stripe */
+       ENTRY;
+
+       CDEBUG(D_READA, DFID "*max_index = %lu, nr = %d\n",
+              PFID(lu_object_fid(lov2lu(loo))), index, r0->lo_nr);
+
+       if (index == 0) /* the page is not covered by any lock */
+               RETURN(0);
+
+       if (r0->lo_nr == 1) /* single stripe file */
+               RETURN(0);
+
+       /* max_index is stripe level, convert it into file level */
+       if (index != CL_PAGE_EOF) {
+               int stripeno = lov_page_stripe(slice->cpl_page);
+               *max_index = lov_stripe_pgoff(loo->lo_lsm, index, stripeno);
+       }
+
+       /* calculate the end of current stripe */
+       pps = loo->lo_lsm->lsm_stripe_size >> PAGE_CACHE_SHIFT;
+       index = slice->cpl_index + pps - slice->cpl_index % pps - 1;
+
+       CDEBUG(D_READA, DFID "*max_index = %lu, index = %lu, pps = %u, "
+              "stripe_size = %u, stripe no = %u, page index = %lu\n",
+              PFID(lu_object_fid(lov2lu(loo))), *max_index, index, pps,
+              loo->lo_lsm->lsm_stripe_size, lov_page_stripe(slice->cpl_page),
+              slice->cpl_index);
+
+       /* never exceed the end of the stripe */
+       *max_index = min_t(pgoff_t, *max_index, index);
+       RETURN(0);
+}
+
+static int lov_raid0_page_print(const struct lu_env *env,
+                               const struct cl_page_slice *slice,
+                               void *cookie, lu_printer_t printer)
+{
+       struct lov_page *lp = cl2lov_page(slice);
 
-        return (*printer)(env, cookie, LUSTRE_LOV_NAME"-page@%p\n", lp);
+       return (*printer)(env, cookie, LUSTRE_LOV_NAME"-page@%p, raid0\n", lp);
 }
 
-static const struct cl_page_operations lov_page_ops = {
-       .cpo_print = lov_page_print
+static const struct cl_page_operations lov_raid0_page_ops = {
+       .cpo_is_under_lock = lov_raid0_page_is_under_lock,
+       .cpo_print = lov_raid0_page_print
 };
 
 int lov_page_init_raid0(const struct lu_env *env, struct cl_object *obj,
@@ -89,15 +137,16 @@ int lov_page_init_raid0(const struct lu_env *env, struct cl_object *obj,
                               &suboff);
        LASSERT(rc == 0);
 
-       cl_page_slice_add(page, &lpg->lps_cl, obj, &lov_page_ops);
+       lpg->lps_stripe = stripe;
+       cl_page_slice_add(page, &lpg->lps_cl, obj, index, &lov_raid0_page_ops);
 
        sub = lov_sub_get(env, lio, stripe);
        if (IS_ERR(sub))
                RETURN(PTR_ERR(sub));
 
        subobj = lovsub2cl(r0->lo_sub[stripe]);
-       cfs_list_for_each_entry(o, &subobj->co_lu.lo_header->loh_layers,
-                               co_lu.lo_linkage) {
+       list_for_each_entry(o, &subobj->co_lu.lo_header->loh_layers,
+                           co_lu.lo_linkage) {
                if (o->co_ops->coo_page_init != NULL) {
                        rc = o->co_ops->coo_page_init(sub->sub_env, o, page,
                                                      cl_index(subobj, suboff));
@@ -109,7 +158,7 @@ int lov_page_init_raid0(const struct lu_env *env, struct cl_object *obj,
        RETURN(rc);
 }
 
-static int lov_page_empty_print(const struct lu_env *env,
+static int lov_empty_page_print(const struct lu_env *env,
                                const struct cl_page_slice *slice,
                                void *cookie, lu_printer_t printer)
 {
@@ -119,7 +168,7 @@ static int lov_page_empty_print(const struct lu_env *env,
 }
 
 static const struct cl_page_operations lov_empty_page_ops = {
-       .cpo_print = lov_page_empty_print
+       .cpo_print = lov_empty_page_print
 };
 
 int lov_page_init_empty(const struct lu_env *env, struct cl_object *obj,
@@ -129,7 +178,7 @@ int lov_page_init_empty(const struct lu_env *env, struct cl_object *obj,
        void *addr;
        ENTRY;
 
-       cl_page_slice_add(page, &lpg->lps_cl, obj, &lov_empty_page_ops);
+       cl_page_slice_add(page, &lpg->lps_cl, obj, index, &lov_empty_page_ops);
        addr = kmap(page->cp_vmpage);
        memset(addr, 0, cl_page_size(obj));
        kunmap(page->cp_vmpage);