LU-6325 ptlrpc: make ptlrpcd threads cpt-aware

[fs/lustre-release.git] / lustre / osc / osc_cache.c

diff --git a/lustre/osc/osc_cache.c b/lustre/osc/osc_cache.c
index 66e08b7..f4b3f96 100644 (file)
--- a/lustre/osc/osc_cache.c
+++ b/lustre/osc/osc_cache.c
@@ -1984,7 +1984,7 @@ static unsigned int get_write_extents(struct osc_object *obj,
 
 static int
 osc_send_write_rpc(const struct lu_env *env, struct client_obd *cli,
-                  struct osc_object *osc, pdl_policy_t pol)
+                  struct osc_object *osc)
 __must_hold(osc)
 {
        struct list_head   rpclist = LIST_HEAD_INIT(rpclist);
@@ -2038,7 +2038,7 @@ __must_hold(osc)
 
        if (!list_empty(&rpclist)) {
                LASSERT(page_count > 0);
-               rc = osc_build_rpc(env, cli, &rpclist, OBD_BRW_WRITE, pol);
+               rc = osc_build_rpc(env, cli, &rpclist, OBD_BRW_WRITE);
                LASSERT(list_empty(&rpclist));
        }
 
@@ -2058,7 +2058,7 @@ __must_hold(osc)
  */
 static int
 osc_send_read_rpc(const struct lu_env *env, struct client_obd *cli,
-                 struct osc_object *osc, pdl_policy_t pol)
+                 struct osc_object *osc)
 __must_hold(osc)
 {
        struct osc_extent *ext;
@@ -2087,7 +2087,7 @@ __must_hold(osc)
                osc_object_unlock(osc);
 
                LASSERT(page_count > 0);
-               rc = osc_build_rpc(env, cli, &rpclist, OBD_BRW_READ, pol);
+               rc = osc_build_rpc(env, cli, &rpclist, OBD_BRW_READ);
                LASSERT(list_empty(&rpclist));
 
                osc_object_lock(osc);
@@ -2137,8 +2137,7 @@ static struct osc_object *osc_next_obj(struct client_obd *cli)
 }
 
 /* called with the loi list lock held */
-static void osc_check_rpcs(const struct lu_env *env, struct client_obd *cli,
-                          pdl_policy_t pol)
+static void osc_check_rpcs(const struct lu_env *env, struct client_obd *cli)
 __must_hold(&cli->cl_loi_list_lock)
 {
        struct osc_object *osc;
@@ -2168,7 +2167,7 @@ __must_hold(&cli->cl_loi_list_lock)
                 * do io on writes while there are cache waiters */
                osc_object_lock(osc);
                if (osc_makes_rpc(cli, osc, OBD_BRW_WRITE)) {
-                       rc = osc_send_write_rpc(env, cli, osc, pol);
+                       rc = osc_send_write_rpc(env, cli, osc);
                        if (rc < 0) {
                                CERROR("Write request failed with %d\n", rc);
 
@@ -2192,7 +2191,7 @@ __must_hold(&cli->cl_loi_list_lock)
                        }
                }
                if (osc_makes_rpc(cli, osc, OBD_BRW_READ)) {
-                       rc = osc_send_read_rpc(env, cli, osc, pol);
+                       rc = osc_send_read_rpc(env, cli, osc);
                        if (rc < 0)
                                CERROR("Read request failed with %d\n", rc);
                }
@@ -2207,7 +2206,7 @@ __must_hold(&cli->cl_loi_list_lock)
 }
 
 static int osc_io_unplug0(const struct lu_env *env, struct client_obd *cli,
-                         struct osc_object *osc, pdl_policy_t pol, int async)
+                         struct osc_object *osc, int async)
 {
        int rc = 0;
 
@@ -2219,7 +2218,7 @@ static int osc_io_unplug0(const struct lu_env *env, struct client_obd *cli,
                 * potential stack overrun problem. LU-2859 */
                atomic_inc(&cli->cl_lru_shrinkers);
                spin_lock(&cli->cl_loi_list_lock);
-               osc_check_rpcs(env, cli, pol);
+               osc_check_rpcs(env, cli);
                spin_unlock(&cli->cl_loi_list_lock);
                atomic_dec(&cli->cl_lru_shrinkers);
        } else {
@@ -2233,14 +2232,13 @@ static int osc_io_unplug0(const struct lu_env *env, struct client_obd *cli,
 static int osc_io_unplug_async(const struct lu_env *env,
                                struct client_obd *cli, struct osc_object *osc)
 {
-       /* XXX: policy is no use actually. */
-       return osc_io_unplug0(env, cli, osc, PDL_POLICY_ROUND, 1);
+       return osc_io_unplug0(env, cli, osc, 1);
 }
 
 void osc_io_unplug(const struct lu_env *env, struct client_obd *cli,
-                  struct osc_object *osc, pdl_policy_t pol)
+                  struct osc_object *osc)
 {
-       (void)osc_io_unplug0(env, cli, osc, pol, 0);
+       (void)osc_io_unplug0(env, cli, osc, 0);
 }
 
 int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops,
@@ -2994,7 +2992,7 @@ int osc_cache_writeback_range(const struct lu_env *env, struct osc_object *obj,
        }
 
        if (unplug)
-               osc_io_unplug(env, osc_cli(obj), obj, PDL_POLICY_ROUND);
+               osc_io_unplug(env, osc_cli(obj), obj);
 
        if (hp || discard) {
                int rc;