X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fvvp_page.c;h=125d02aeba1040a3482b7a86d1b4a549a290e4ae;hb=c06fc9da14b061aa4f1f3e652683eb648b02ae8e;hp=7285045a2f5b641322d573decb86e5d5363d5f02;hpb=118bb27a7b2acce63cd0cf52af10f53b95f2a732;p=fs%2Flustre-release.git

diff --git a/lustre/llite/vvp_page.c b/lustre/llite/vvp_page.c
index 7285045..125d02a 100644
--- a/lustre/llite/vvp_page.c
+++ b/lustre/llite/vvp_page.c
@@ -78,44 +78,29 @@ static void vvp_page_fini(const struct lu_env *env,
         vvp_page_fini_common(cp);
 }
 
-static void vvp_page_own(const struct lu_env *env,
-                         const struct cl_page_slice *slice, struct cl_io *io)
+static int vvp_page_own(const struct lu_env *env,
+                        const struct cl_page_slice *slice, struct cl_io *io,
+                        int nonblock)
 {
         struct ccc_page *vpg    = cl2ccc_page(slice);
         cfs_page_t      *vmpage = vpg->cpg_page;
-        int count = 0;
 
         LASSERT(vmpage != NULL);
+        if (nonblock) {
+                if (TestSetPageLocked(vmpage))
+                        return -EAGAIN;
 
-        /* DEBUG CODE FOR #18881 */
-        while (TestSetPageLocked(vmpage)) {
-                cfs_schedule_timeout(CFS_TASK_INTERRUPTIBLE,
-                                     cfs_time_seconds(1)/10);
-                if (++count > 600) {
-                        CL_PAGE_DEBUG(D_ERROR, env,
-                                      cl_page_top(slice->cpl_page),
-                                      "XXX page %p blocked on acquiring the"
-                                      " lock. process %s/%p, flags %lx,io %p\n",
-                                      vmpage, current->comm, current,
-                                      vmpage->flags, io);
-                        libcfs_debug_dumpstack(NULL);
-                        if (slice->cpl_page->cp_task) {
-                                cfs_task_t *tsk = slice->cpl_page->cp_task;
-                                LCONSOLE_WARN("The page was owned by %s\n",
-                                              tsk->comm);
-                                libcfs_debug_dumpstack(tsk);
-                        }
-                        LCONSOLE_WARN("Reproduced bug #18881,please contact:"
-                               "jay <jinshan.xiong@sun.com>, thanks\n");
-
-                        lock_page(vmpage);
-                        break;
+                if (unlikely(PageWriteback(vmpage))) {
+                        unlock_page(vmpage);
+                        return -EAGAIN;
                 }
+
+                return 0;
         }
-        /* DEBUG CODE END */
 
-        /* lock_page(vmpage); */
+        lock_page(vmpage);
         wait_on_page_writeback(vmpage);
+        return 0;
 }
 
 static void vvp_page_assume(const struct lu_env *env,
@@ -277,14 +262,10 @@ static void vvp_page_completion_common(const struct lu_env *env,
         struct cl_page    *clp    = cp->cpg_cl.cpl_page;
         cfs_page_t        *vmpage = cp->cpg_page;
         struct inode      *inode  = ccc_object_inode(clp->cp_obj);
-        struct cl_sync_io *anchor = cp->cpg_sync_io;
 
         LINVRNT(cl_page_is_vmlocked(env, clp));
 
-        if (anchor != NULL) {
-                cp->cpg_sync_io  = NULL;
-                cl_sync_io_note(anchor, ioret);
-        } else if (clp->cp_type == CPT_CACHEABLE) {
+        if (!clp->cp_sync_io && clp->cp_type == CPT_CACHEABLE) {
                 /*
                  * Only mark the page error only when it's a cacheable page
                  * and NOT a sync io.
@@ -469,11 +450,12 @@ static void vvp_transient_page_verify(const struct cl_page *page)
         /* LASSERT_SEM_LOCKED(&inode->i_alloc_sem); */
 }
 
-static void vvp_transient_page_own(const struct lu_env *env,
-                                   const struct cl_page_slice *slice,
-                                   struct cl_io *unused)
+static int vvp_transient_page_own(const struct lu_env *env,
+                                  const struct cl_page_slice *slice,
+                                  struct cl_io *unused, int nonblock)
 {
         vvp_transient_page_verify(slice->cpl_page);
+        return 0;
 }
 
 static void vvp_transient_page_assume(const struct lu_env *env,