LU-9920 vvp: dirty pages with pagevec

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

diff --git a/lustre/osc/osc_cache.c b/lustre/osc/osc_cache.c
index 8cf0158..665a63a 100644 (file)
--- a/lustre/osc/osc_cache.c
+++ b/lustre/osc/osc_cache.c
@@ -2356,13 +2356,14 @@ int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops,
 EXPORT_SYMBOL(osc_prep_async_page);
 
 int osc_queue_async_io(const struct lu_env *env, struct cl_io *io,
-                      struct osc_page *ops)
+                      struct osc_page *ops, cl_commit_cbt cb)
 {
        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 pagevec        *pvec = &osc_env_info(env)->oti_pagevec;
        pgoff_t index;
        unsigned int tmp;
        unsigned int grants = 0;
@@ -2481,7 +2482,14 @@ int osc_queue_async_io(const struct lu_env *env, struct cl_io *io,
 
                rc = 0;
                if (grants == 0) {
-                       /* we haven't allocated grant for this page. */
+                       /* We haven't allocated grant for this page, and we
+                        * must not hold a page lock while we do enter_cache,
+                        * so we must mark dirty & unlock any pages in the
+                        * write commit pagevec. */
+                       if (pagevec_count(pvec)) {
+                               cb(env, io, pvec);
+                               pagevec_reinit(pvec);
+                       }
                        rc = osc_enter_cache(env, cli, oap, tmp);
                        if (rc == 0)
                                grants = tmp;