LU-10994 osc: remove oap_cli

Remove the redundant oap_cli member from struct osc_async_page.

...:(cl_page.c:216:__cl_page_alloc()) slab-alloced 'cl_page': 256 at 000000009ab84b37.

Signed-off-by: John L. Hammond <jhammond@whamcloud.com>
Change-Id: Idd088f0906a10773568495933592ac5e755dc047
Reviewed-on: https://review.whamcloud.com/47403
Reviewed-by: Patrick Farrell <pfarrell@whamcloud.com>
Reviewed-by: Bobi Jam <bobijam@hotmail.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/include/lustre_osc.h b/lustre/include/lustre_osc.h
index c011a09..bcb9c4a 100644 (file)
--- a/lustre/include/lustre_osc.h
+++ b/lustre/include/lustre_osc.h
@@ -84,7 +84,6 @@ struct osc_async_page {
        struct brw_page         oap_brw_page;
 
        struct ptlrpc_request   *oap_request;
-       struct client_obd       *oap_cli;
        struct osc_object       *oap_obj;
 
        spinlock_t               oap_lock;

diff --git a/lustre/osc/osc_cache.c b/lustre/osc/osc_cache.c
index fece8dc..cbf4713 100644 (file)
--- a/lustre/osc/osc_cache.c
+++ b/lustre/osc/osc_cache.c
@@ -2242,7 +2242,6 @@ EXPORT_SYMBOL(osc_io_unplug0);
 int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops,
                        struct cl_page *page, loff_t offset)
 {
-       struct obd_export     *exp = osc_export(osc);
        struct osc_async_page *oap = &ops->ops_oap;
        struct page           *vmpage = page->cp_vmpage;
        ENTRY;
@@ -2251,7 +2250,6 @@ int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops,
                return cfs_size_round(sizeof(*oap));
 
        oap->oap_magic = OAP_MAGIC;
-       oap->oap_cli = &exp->exp_obd->u.cli;
        oap->oap_obj = osc;
 
        oap->oap_page = vmpage;
@@ -2282,8 +2280,8 @@ int osc_queue_async_io(const struct lu_env *env, struct cl_io *io,
        struct osc_io *oio = osc_env_io(env);
        struct osc_extent     *ext = NULL;
        struct osc_async_page *oap = &ops->ops_oap;
-       struct client_obd     *cli = oap->oap_cli;
        struct osc_object     *osc = oap->oap_obj;
+       struct client_obd     *cli = osc_cli(osc);
        struct pagevec        *pvec = &osc_env_info(env)->oti_pagevec;
        pgoff_t index;
        unsigned int tmp;

diff --git a/lustre/osc/osc_page.c b/lustre/osc/osc_page.c
index 1c255d3..73a29f6 100644 (file)
--- a/lustre/osc/osc_page.c
+++ b/lustre/osc/osc_page.c
@@ -141,7 +141,7 @@ static int osc_page_print(const struct lu_env *env,
                          /* 2 */
                          oap->oap_obj_off, oap->oap_page_off, oap->oap_count,
                          oap->oap_async_flags, oap->oap_brw_flags,
-                         oap->oap_request, oap->oap_cli, obj,
+                         oap->oap_request, cli, obj,
                          /* 3 */
                          opg->ops_transfer_pinned,
                          osc_submit_duration(opg), opg->ops_srvlock,