Whamcloud - gitweb
LU-4198 clio: turn on lockless for some kind of IO
[fs/lustre-release.git] / lustre / llite / vvp_page.c
index d199ad6..7fb019c 100644 (file)
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  * Implementation of cl_page for VVP layer.
  *
  *   Author: Nikita Danilov <nikita.danilov@sun.com>
+ *   Author: Jinshan Xiong <jinshan.xiong@whamcloud.com>
  */
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
-#ifndef __KERNEL__
-# error This file is kernel only.
-#endif
-
-#include <obd.h>
-#include <lustre_lite.h>
+#include <linux/atomic.h>
+#include <linux/bitops.h>
+#include <linux/mm.h>
+#include <linux/mutex.h>
+#include <linux/page-flags.h>
+#include <linux/pagemap.h>
 
+#include <libcfs/libcfs.h>
+#include "llite_internal.h"
 #include "vvp_internal.h"
 
 /*****************************************************************************
  *
  */
 
-static void vvp_page_fini_common(struct ccc_page *cp)
+static void vvp_page_fini_common(struct vvp_page *vpg, struct pagevec *pvec)
 {
-        cfs_page_t *vmpage = cp->cpg_page;
-
-        LASSERT(vmpage != NULL);
-        page_cache_release(vmpage);
-        OBD_SLAB_FREE_PTR(cp, vvp_page_kmem);
+       struct page *vmpage = vpg->vpg_page;
+
+       LASSERT(vmpage != NULL);
+       if (pvec) {
+               if (!pagevec_add(pvec, vmpage))
+                       pagevec_release(pvec);
+       } else {
+               put_page(vmpage);
+       }
 }
 
 static void vvp_page_fini(const struct lu_env *env,
-                          struct cl_page_slice *slice)
+                         struct cl_page_slice *slice,
+                         struct pagevec *pvec)
 {
-        struct ccc_page *cp = cl2ccc_page(slice);
-        cfs_page_t *vmpage  = cp->cpg_page;
-
-        /*
-         * vmpage->private was already cleared when page was moved into
-         * VPG_FREEING state.
-         */
-        LASSERT((struct cl_page *)vmpage->private != slice->cpl_page);
-        vvp_page_fini_common(cp);
+       struct vvp_page *vpg     = cl2vvp_page(slice);
+       struct page     *vmpage  = vpg->vpg_page;
+
+       /*
+        * vmpage->private was already cleared when page was moved into
+        * VPG_FREEING state.
+        */
+       LASSERT((struct cl_page *)vmpage->private != slice->cpl_page);
+       vvp_page_fini_common(vpg, pvec);
 }
 
-static void vvp_page_own(const struct lu_env *env,
-                         const struct cl_page_slice *slice, struct cl_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;
+       struct vvp_page *vpg    = cl2vvp_page(slice);
+       struct page     *vmpage = vpg->vpg_page;
 
-        LASSERT(vmpage != NULL);
-        lock_page(vmpage);
-        wait_on_page_writeback(vmpage);
+       LASSERT(vmpage != NULL);
+       if (nonblock) {
+               if (!trylock_page(vmpage))
+                       return -EAGAIN;
+
+               if (unlikely(PageWriteback(vmpage))) {
+                       unlock_page(vmpage);
+                       return -EAGAIN;
+               }
+
+               return 0;
+       }
+
+       lock_page(vmpage);
+       wait_on_page_writeback(vmpage);
+
+       return 0;
 }
 
 static void vvp_page_assume(const struct lu_env *env,
-                            const struct cl_page_slice *slice, struct cl_io *_)
+                           const struct cl_page_slice *slice,
+                           struct cl_io *unused)
 {
-        cfs_page_t *vmpage = cl2vm_page(slice);
+       struct page *vmpage = cl2vm_page(slice);
 
-        LASSERT(vmpage != NULL);
-        LASSERT(PageLocked(vmpage));
-        wait_on_page_writeback(vmpage);
+       LASSERT(vmpage != NULL);
+       LASSERT(PageLocked(vmpage));
+       wait_on_page_writeback(vmpage);
 }
 
 static void vvp_page_unassume(const struct lu_env *env,
-                              const struct cl_page_slice *slice,
-                              struct cl_io *_)
+                             const struct cl_page_slice *slice,
+                             struct cl_io *unused)
 {
-        cfs_page_t *vmpage = cl2vm_page(slice);
+       struct page *vmpage = cl2vm_page(slice);
 
-        LASSERT(vmpage != NULL);
-        LASSERT(PageLocked(vmpage));
+       LASSERT(vmpage != NULL);
+       LASSERT(PageLocked(vmpage));
 }
 
 static void vvp_page_disown(const struct lu_env *env,
-                            const struct cl_page_slice *slice, struct cl_io *io)
+                           const struct cl_page_slice *slice, struct cl_io *io)
 {
-        cfs_page_t *vmpage = cl2vm_page(slice);
+       struct page *vmpage = cl2vm_page(slice);
 
-        LASSERT(vmpage != NULL);
-        LASSERT(PageLocked(vmpage));
+       LASSERT(vmpage != NULL);
+       LASSERT(PageLocked(vmpage));
 
-        unlock_page(cl2vm_page(slice));
+       unlock_page(cl2vm_page(slice));
 }
 
 static void vvp_page_discard(const struct lu_env *env,
-                             const struct cl_page_slice *slice, struct cl_io *_)
+                            const struct cl_page_slice *slice,
+                            struct cl_io *unused)
 {
-        cfs_page_t           *vmpage  = cl2vm_page(slice);
-        struct address_space *mapping = vmpage->mapping;
-        struct ccc_page      *cpg     = cl2ccc_page(slice);
+       struct page     *vmpage = cl2vm_page(slice);
+       struct vvp_page *vpg    = cl2vvp_page(slice);
 
-        LASSERT(vmpage != NULL);
-        LASSERT(PageLocked(vmpage));
+       LASSERT(vmpage != NULL);
+       LASSERT(PageLocked(vmpage));
 
-        if (cpg->cpg_defer_uptodate && !cpg->cpg_ra_used)
-                ll_ra_stats_inc(mapping, RA_STAT_DISCARDED);
+       if (vpg->vpg_defer_uptodate && !vpg->vpg_ra_used)
+               ll_ra_stats_inc(vmpage->mapping->host, RA_STAT_DISCARDED);
 
-        /*
-         * truncate_complete_page() calls
-         * a_ops->invalidatepage()->cl_page_delete()->vvp_page_delete().
-         */
-        truncate_complete_page(mapping, vmpage);
-}
-
-static int vvp_page_unmap(const struct lu_env *env,
-                          const struct cl_page_slice *slice, struct cl_io *_)
-{
-        cfs_page_t *vmpage = cl2vm_page(slice);
-        __u64       offset = vmpage->index << CFS_PAGE_SHIFT;
-
-        LASSERT(vmpage != NULL);
-        LASSERT(PageLocked(vmpage));
-        /*
-         * XXX is it safe to call this with the page lock held?
-         */
-        ll_teardown_mmaps(vmpage->mapping, offset, offset + CFS_PAGE_SIZE);
-        return 0;
+       generic_error_remove_page(vmpage->mapping, vmpage);
 }
 
 static void vvp_page_delete(const struct lu_env *env,
-                            const struct cl_page_slice *slice)
+                           const struct cl_page_slice *slice)
 {
-        cfs_page_t       *vmpage = cl2vm_page(slice);
-        struct inode     *inode  = vmpage->mapping->host;
-        struct cl_object *obj    = slice->cpl_obj;
-
-        LASSERT(PageLocked(vmpage));
-        LASSERT((struct cl_page *)vmpage->private == slice->cpl_page);
-        LASSERT(inode == ccc_object_inode(obj));
-
-        vvp_write_complete(cl2ccc(obj), cl2ccc_page(slice));
-        ClearPagePrivate(vmpage);
-        vmpage->private = 0;
-        /*
-         * Reference from vmpage to cl_page is removed, but the reference back
-         * is still here. It is removed later in vvp_page_fini().
-         */
+       struct page      *vmpage = cl2vm_page(slice);
+       struct inode     *inode  = vmpage->mapping->host;
+       struct cl_object *obj    = slice->cpl_obj;
+       struct cl_page   *page   = slice->cpl_page;
+       int refc;
+
+       LASSERT(PageLocked(vmpage));
+       LASSERT((struct cl_page *)vmpage->private == page);
+       LASSERT(inode == vvp_object_inode(obj));
+
+       /* Drop the reference count held in vvp_page_init */
+       refc = atomic_dec_return(&page->cp_ref);
+       LASSERTF(refc >= 1, "page = %p, refc = %d\n", page, refc);
+
+       ClearPagePrivate(vmpage);
+       vmpage->private = 0;
+       /*
+        * Reference from vmpage to cl_page is removed, but the reference back
+        * is still here. It is removed later in vvp_page_fini().
+        */
 }
 
 static void vvp_page_export(const struct lu_env *env,
-                            const struct cl_page_slice *slice)
+                           const struct cl_page_slice *slice,
+                           int uptodate)
 {
-        cfs_page_t *vmpage = cl2vm_page(slice);
-
-        LASSERT(vmpage != NULL);
-        LASSERT(PageLocked(vmpage));
-        SetPageUptodate(vmpage);
+       struct page *vmpage = cl2vm_page(slice);
+
+       LASSERT(vmpage != NULL);
+       LASSERT(PageLocked(vmpage));
+       if (uptodate)
+               SetPageUptodate(vmpage);
+       else
+               ClearPageUptodate(vmpage);
 }
 
 static int vvp_page_is_vmlocked(const struct lu_env *env,
@@ -193,7 +203,7 @@ static int vvp_page_is_vmlocked(const struct lu_env *env,
 
 static int vvp_page_prep_read(const struct lu_env *env,
                               const struct cl_page_slice *slice,
-                              struct cl_io *_)
+                              struct cl_io *unused)
 {
         ENTRY;
         /* Skip the page already marked as PG_uptodate. */
@@ -202,17 +212,20 @@ static int vvp_page_prep_read(const struct lu_env *env,
 
 static int vvp_page_prep_write(const struct lu_env *env,
                                const struct cl_page_slice *slice,
-                               struct cl_io *_)
+                               struct cl_io *unused)
 {
-        cfs_page_t *vmpage = cl2vm_page(slice);
-        int result;
-
-        if (clear_page_dirty_for_io(vmpage)) {
-                set_page_writeback(vmpage);
-                result = 0;
-        } else
-                result = -EALREADY;
-        return result;
+       struct page *vmpage = cl2vm_page(slice);
+       struct cl_page *pg = slice->cpl_page;
+
+       LASSERT(PageLocked(vmpage));
+       LASSERT(!PageDirty(vmpage));
+
+       /* ll_writepage path is not a sync write, so need to set page writeback
+        * flag */
+       if (pg->cp_sync_io == NULL)
+               set_page_writeback(vmpage);
+
+       return 0;
 }
 
 /**
@@ -221,101 +234,88 @@ static int vvp_page_prep_write(const struct lu_env *env,
  * This takes inode as a separate argument, because inode on which error is to
  * be set can be different from \a vmpage inode in case of direct-io.
  */
-static void vvp_vmpage_error(struct inode *inode, cfs_page_t *vmpage, int ioret)
+static void vvp_vmpage_error(struct inode *inode, struct page *vmpage, int ioret)
 {
-        if (ioret == 0)
-                ClearPageError(vmpage);
-        else if (ioret != -EINTR) {
-                SetPageError(vmpage);
-                if (ioret == -ENOSPC)
-                        set_bit(AS_ENOSPC, &inode->i_mapping->flags);
-                else
-                        set_bit(AS_EIO, &inode->i_mapping->flags);
-        }
-}
-
-static void vvp_page_completion_common(const struct lu_env *env,
-                                       struct ccc_page *cp, int ioret)
-{
-        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));
-        KLASSERT(!PageWriteback(vmpage));
-
-        vvp_vmpage_error(inode, vmpage, ioret);
-
-        if (anchor != NULL) {
-                cp->cpg_sync_io  = NULL;
-                cl_sync_io_note(anchor, ioret);
-        } else if (clp->cp_type == CPT_CACHEABLE)
-                unlock_page(vmpage);
+       struct vvp_object *obj = cl_inode2vvp(inode);
+
+       if (ioret == 0) {
+               ClearPageError(vmpage);
+               obj->vob_discard_page_warned = 0;
+       } else {
+               SetPageError(vmpage);
+               if (ioret == -ENOSPC)
+                       set_bit(AS_ENOSPC, &inode->i_mapping->flags);
+               else
+                       set_bit(AS_EIO, &inode->i_mapping->flags);
+
+               if ((ioret == -ESHUTDOWN || ioret == -EINTR ||
+                    ioret == -EIO) && obj->vob_discard_page_warned == 0) {
+                       obj->vob_discard_page_warned = 1;
+                       ll_dirty_page_discard_warn(vmpage, ioret);
+               }
+       }
 }
 
 static void vvp_page_completion_read(const struct lu_env *env,
-                                     const struct cl_page_slice *slice,
-                                     int ioret)
-{
-        struct ccc_page *cp    = cl2ccc_page(slice);
-        struct cl_page  *page  = cl_page_top(slice->cpl_page);
-        struct inode    *inode = ccc_object_inode(page->cp_obj);
-        ENTRY;
-
-        CL_PAGE_HEADER(D_PAGE, env, page, "completing READ with %d\n", ioret);
-
-        if (cp->cpg_defer_uptodate)
-                ll_ra_count_put(ll_i2sbi(inode), 1);
-
-        if (ioret == 0)  {
-                /* XXX: do we need this for transient pages? */
-                if (!cp->cpg_defer_uptodate)
-                        cl_page_export(env, page);
-        } else
-                cp->cpg_defer_uptodate = 0;
-        vvp_page_completion_common(env, cp, ioret);
-
-        EXIT;
-}
-
-static void vvp_page_completion_write_common(const struct lu_env *env,
-                                             const struct cl_page_slice *slice,
-                                             int ioret)
+                                    const struct cl_page_slice *slice,
+                                    int ioret)
 {
-        struct ccc_page *cp = cl2ccc_page(slice);
-
-        if (ioret == 0) {
-                cp->cpg_write_queued = 0;
-                /*
-                 * Only ioret == 0, write succeed, then this page could be
-                 * deleted from the pending_writing count.
-                 */
-                vvp_write_complete(cl2ccc(slice->cpl_obj), cp);
-        }
-        vvp_page_completion_common(env, cp, ioret);
+       struct vvp_page *vpg    = cl2vvp_page(slice);
+       struct page     *vmpage = vpg->vpg_page;
+       struct cl_page  *page   = slice->cpl_page;
+       struct inode    *inode  = vvp_object_inode(page->cp_obj);
+       ENTRY;
+
+       LASSERT(PageLocked(vmpage));
+       CL_PAGE_HEADER(D_PAGE, env, page, "completing READ with %d\n", ioret);
+
+       if (vpg->vpg_defer_uptodate)
+               ll_ra_count_put(ll_i2sbi(inode), 1);
+
+       if (ioret == 0)  {
+               if (!vpg->vpg_defer_uptodate)
+                       cl_page_export(env, page, 1);
+       } else if (vpg->vpg_defer_uptodate) {
+               vpg->vpg_defer_uptodate = 0;
+               if (ioret == -EWOULDBLOCK) {
+                       /* mirror read failed, it needs to destroy the page
+                        * because subpage would be from wrong osc when trying
+                        * to read from a new mirror */
+                       generic_error_remove_page(vmpage->mapping, vmpage);
+               }
+       }
+
+       if (page->cp_sync_io == NULL)
+               unlock_page(vmpage);
+
+       EXIT;
 }
 
 static void vvp_page_completion_write(const struct lu_env *env,
-                                      const struct cl_page_slice *slice,
-                                      int ioret)
+                                     const struct cl_page_slice *slice,
+                                     int ioret)
 {
-        struct ccc_page *cp     = cl2ccc_page(slice);
-        struct cl_page  *pg     = slice->cpl_page;
-        cfs_page_t      *vmpage = cp->cpg_page;
-
-        ENTRY;
-
-        LINVRNT(cl_page_is_vmlocked(env, pg));
-        LASSERT(PageWriteback(vmpage));
-
-        CL_PAGE_HEADER(D_PAGE, env, pg, "completing WRITE with %d\n", ioret);
-
-        end_page_writeback(vmpage);
-        LASSERT(!PageWriteback(vmpage));
-
-        vvp_page_completion_write_common(env, slice, ioret);
-        EXIT;
+       struct vvp_page *vpg    = cl2vvp_page(slice);
+       struct cl_page  *pg     = slice->cpl_page;
+       struct page     *vmpage = vpg->vpg_page;
+       ENTRY;
+
+       CL_PAGE_HEADER(D_PAGE, env, pg, "completing WRITE with %d\n", ioret);
+
+       if (pg->cp_sync_io != NULL) {
+               LASSERT(PageLocked(vmpage));
+               LASSERT(!PageWriteback(vmpage));
+       } else {
+               LASSERT(PageWriteback(vmpage));
+               /*
+                * Only mark the page error only when it's an async write
+                * because applications won't wait for IO to finish.
+                */
+               vvp_vmpage_error(vvp_object_inode(pg->cp_obj), vmpage, ioret);
+
+               end_page_writeback(vmpage);
+       }
+       EXIT;
 }
 
 /**
@@ -333,131 +333,98 @@ static void vvp_page_completion_write(const struct lu_env *env,
  * truncated. Skip it.
  */
 static int vvp_page_make_ready(const struct lu_env *env,
-                               const struct cl_page_slice *slice)
+                              const struct cl_page_slice *slice)
 {
-        cfs_page_t *vmpage = cl2vm_page(slice);
-        struct cl_page *pg = slice->cpl_page;
-        int result;
-
-        result = -EAGAIN;
-        /* we're trying to write, but the page is locked.. come back later */
-        if (!TestSetPageLocked(vmpage)) {
-                if (pg->cp_state == CPS_CACHED) {
-                        /*
-                         * We can cancel IO if page wasn't dirty after all.
-                         */
-                        clear_page_dirty_for_io(vmpage);
-                        /*
-                         * This actually clears the dirty bit in the radix
-                         * tree.
-                         */
-                        set_page_writeback(vmpage);
-
-                        CL_PAGE_HEADER(D_PAGE, env, pg, "readied\n");
-                        result = 0;
-                } else
-                        /*
-                         * Page was concurrently truncated.
-                         */
-                        LASSERT(pg->cp_state == CPS_FREEING);
-        }
-        RETURN(result);
+       struct page *vmpage = cl2vm_page(slice);
+       struct cl_page *pg = slice->cpl_page;
+       int result = 0;
+
+       lock_page(vmpage);
+       if (clear_page_dirty_for_io(vmpage)) {
+               LASSERT(pg->cp_state == CPS_CACHED);
+               /* This actually clears the dirty bit in the radix
+                * tree. */
+               set_page_writeback(vmpage);
+               CL_PAGE_HEADER(D_PAGE, env, pg, "readied\n");
+       } else if (pg->cp_state == CPS_PAGEOUT) {
+               /* is it possible for osc_flush_async_page() to already
+                * make it ready? */
+               result = -EALREADY;
+       } else {
+               CL_PAGE_DEBUG(D_ERROR, env, pg, "Unexpecting page state %d.\n",
+                             pg->cp_state);
+               LBUG();
+       }
+       unlock_page(vmpage);
+       RETURN(result);
 }
 
 static int vvp_page_print(const struct lu_env *env,
-                          const struct cl_page_slice *slice,
-                          void *cookie, lu_printer_t printer)
+                         const struct cl_page_slice *slice,
+                         void *cookie, lu_printer_t printer)
 {
-        struct ccc_page *vp = cl2ccc_page(slice);
-        cfs_page_t      *vmpage = vp->cpg_page;
-
-        (*printer)(env, cookie, LUSTRE_VVP_NAME"-page@%p(%d:%d:%d) "
-                   "vm@%p ",
-                   vp, vp->cpg_defer_uptodate, vp->cpg_ra_used,
-                   vp->cpg_write_queued, vmpage);
-        if (vmpage != NULL) {
-                (*printer)(env, cookie, "%lx %d:%d %lx %lu %slru",
-                           (long)vmpage->flags, page_count(vmpage),
-                           page_mapcount(vmpage), vmpage->private,
-                           page_index(vmpage),
-                           list_empty(&vmpage->lru) ? "not-" : "");
-        }
-        (*printer)(env, cookie, "\n");
-        return 0;
-}
+       struct vvp_page *vpg    = cl2vvp_page(slice);
+       struct page     *vmpage = vpg->vpg_page;
 
-static const struct cl_page_operations vvp_page_ops = {
-        .cpo_own           = vvp_page_own,
-        .cpo_assume        = vvp_page_assume,
-        .cpo_unassume      = vvp_page_unassume,
-        .cpo_disown        = vvp_page_disown,
-        .cpo_vmpage        = ccc_page_vmpage,
-        .cpo_discard       = vvp_page_discard,
-        .cpo_delete        = vvp_page_delete,
-        .cpo_unmap         = vvp_page_unmap,
-        .cpo_export        = vvp_page_export,
-        .cpo_is_vmlocked   = vvp_page_is_vmlocked,
-        .cpo_fini          = vvp_page_fini,
-        .cpo_print         = vvp_page_print,
-        .cpo_is_under_lock = ccc_page_is_under_lock,
-        .io = {
-                [CRT_READ] = {
-                        .cpo_prep        = vvp_page_prep_read,
-                        .cpo_completion  = vvp_page_completion_read,
-                        .cpo_make_ready  = ccc_fail,
-                },
-                [CRT_WRITE] = {
-                        .cpo_prep        = vvp_page_prep_write,
-                        .cpo_completion  = vvp_page_completion_write,
-                        .cpo_make_ready  = vvp_page_make_ready,
-                }
-        }
-};
+       (*printer)(env, cookie, LUSTRE_VVP_NAME"-page@%p(%d:%d) "
+                  "vm@%p ",
+                  vpg, vpg->vpg_defer_uptodate, vpg->vpg_ra_used, vmpage);
 
-static void vvp_transient_page_verify(const struct cl_page *page)
-{
-        struct inode *inode = ccc_object_inode(page->cp_obj);
+       if (vmpage != NULL) {
+               (*printer)(env, cookie, "%lx %d:%d %lx %lu %slru",
+                          (long)vmpage->flags, page_count(vmpage),
+                          page_mapcount(vmpage), vmpage->private,
+                          page_index(vmpage),
+                          list_empty(&vmpage->lru) ? "not-" : "");
+       }
 
-        LASSERT(!TRYLOCK_INODE_MUTEX(inode));
-        /* LASSERT_SEM_LOCKED(&inode->i_alloc_sem); */
-}
+       (*printer)(env, cookie, "\n");
 
-static void vvp_transient_page_own(const struct lu_env *env,
-                                   const struct cl_page_slice *slice,
-                                   struct cl_io *_)
-{
-        vvp_transient_page_verify(slice->cpl_page);
+       return 0;
 }
 
-static void vvp_transient_page_assume(const struct lu_env *env,
-                                      const struct cl_page_slice *slice,
-                                      struct cl_io *_)
+static int vvp_page_fail(const struct lu_env *env,
+                        const struct cl_page_slice *slice)
 {
-        vvp_transient_page_verify(slice->cpl_page);
-}
+       /*
+        * Cached read?
+        */
+       LBUG();
 
-static void vvp_transient_page_unassume(const struct lu_env *env,
-                                        const struct cl_page_slice *slice,
-                                        struct cl_io *_)
-{
-        vvp_transient_page_verify(slice->cpl_page);
+       return 0;
 }
 
-static void vvp_transient_page_disown(const struct lu_env *env,
-                                      const struct cl_page_slice *slice,
-                                      struct cl_io *_)
-{
-        vvp_transient_page_verify(slice->cpl_page);
-}
+static const struct cl_page_operations vvp_page_ops = {
+       .cpo_own           = vvp_page_own,
+       .cpo_assume        = vvp_page_assume,
+       .cpo_unassume      = vvp_page_unassume,
+       .cpo_disown        = vvp_page_disown,
+       .cpo_discard       = vvp_page_discard,
+       .cpo_delete        = vvp_page_delete,
+       .cpo_export        = vvp_page_export,
+       .cpo_is_vmlocked   = vvp_page_is_vmlocked,
+       .cpo_fini          = vvp_page_fini,
+       .cpo_print         = vvp_page_print,
+       .io = {
+               [CRT_READ] = {
+                       .cpo_prep       = vvp_page_prep_read,
+                       .cpo_completion = vvp_page_completion_read,
+                       .cpo_make_ready = vvp_page_fail,
+               },
+               [CRT_WRITE] = {
+                       .cpo_prep       = vvp_page_prep_write,
+                       .cpo_completion = vvp_page_completion_write,
+                       .cpo_make_ready = vvp_page_make_ready,
+               },
+       },
+};
 
 static void vvp_transient_page_discard(const struct lu_env *env,
                                        const struct cl_page_slice *slice,
-                                       struct cl_io *_)
+                                       struct cl_io *unused)
 {
         struct cl_page *page = slice->cpl_page;
 
-        vvp_transient_page_verify(slice->cpl_page);
-
         /*
          * For transient pages, remove it from the radix tree.
          */
@@ -465,92 +432,53 @@ static void vvp_transient_page_discard(const struct lu_env *env,
 }
 
 static int vvp_transient_page_is_vmlocked(const struct lu_env *env,
-                                          const struct cl_page_slice *slice)
-{
-        struct inode    *inode = ccc_object_inode(slice->cpl_obj);
-        int              locked;
-
-        locked = !TRYLOCK_INODE_MUTEX(inode);
-        if (!locked)
-                UNLOCK_INODE_MUTEX(inode);
-        return locked ? -EBUSY : -ENODATA;
-}
-
-static void
-vvp_transient_page_completion_write(const struct lu_env *env,
-                                    const struct cl_page_slice *slice,
-                                    int ioret)
+                                         const struct cl_page_slice *slice)
 {
-        vvp_transient_page_verify(slice->cpl_page);
-        vvp_page_completion_write_common(env, slice, ioret);
+       return -EBUSY;
 }
 
-
 static void vvp_transient_page_fini(const struct lu_env *env,
-                                    struct cl_page_slice *slice)
+                                   struct cl_page_slice *slice,
+                                   struct pagevec *pvec)
 {
-        struct ccc_page *cp = cl2ccc_page(slice);
-        struct cl_page *clp = slice->cpl_page;
-        struct ccc_object *clobj = cl2ccc(clp->cp_obj);
+       struct vvp_page *vpg = cl2vvp_page(slice);
+       struct vvp_object *clobj = cl2vvp(slice->cpl_obj);
 
-        vvp_page_fini_common(cp);
-        LASSERT(!TRYLOCK_INODE_MUTEX(clobj->cob_inode));
-        clobj->cob_transient_pages--;
+       vvp_page_fini_common(vpg, pvec);
+       atomic_dec(&clobj->vob_transient_pages);
 }
 
 static const struct cl_page_operations vvp_transient_page_ops = {
-        .cpo_own           = vvp_transient_page_own,
-        .cpo_assume        = vvp_transient_page_assume,
-        .cpo_unassume      = vvp_transient_page_unassume,
-        .cpo_disown        = vvp_transient_page_disown,
-        .cpo_discard       = vvp_transient_page_discard,
-        .cpo_vmpage        = ccc_page_vmpage,
-        .cpo_fini          = vvp_transient_page_fini,
-        .cpo_is_vmlocked   = vvp_transient_page_is_vmlocked,
-        .cpo_print         = vvp_page_print,
-        .cpo_is_under_lock = ccc_page_is_under_lock,
-        .io = {
-                [CRT_READ] = {
-                        .cpo_prep        = ccc_transient_page_prep,
-                        .cpo_completion  = vvp_page_completion_read,
-                },
-                [CRT_WRITE] = {
-                        .cpo_prep        = ccc_transient_page_prep,
-                        .cpo_completion  = vvp_transient_page_completion_write,
-                }
-        }
+       .cpo_discard            = vvp_transient_page_discard,
+       .cpo_fini               = vvp_transient_page_fini,
+       .cpo_is_vmlocked        = vvp_transient_page_is_vmlocked,
+       .cpo_print              = vvp_page_print,
 };
 
-struct cl_page *vvp_page_init(const struct lu_env *env, struct cl_object *obj,
-                              struct cl_page *page, cfs_page_t *vmpage)
+int vvp_page_init(const struct lu_env *env, struct cl_object *obj,
+               struct cl_page *page, pgoff_t index)
 {
-        struct ccc_page *cpg;
-        int result;
-
-        CLOBINVRNT(env, obj, ccc_object_invariant(obj));
-
-        OBD_SLAB_ALLOC_PTR(cpg, vvp_page_kmem);
-        if (cpg != NULL) {
-                cpg->cpg_page = vmpage;
-                page_cache_get(vmpage);
-
-                CFS_INIT_LIST_HEAD(&cpg->cpg_pending_linkage);
-                if (page->cp_type == CPT_CACHEABLE) {
-                        SetPagePrivate(vmpage);
-                        vmpage->private = (unsigned long)page;
-                        cl_page_slice_add(page, &cpg->cpg_cl, obj,
-                                          &vvp_page_ops);
-                } else {
-                        struct ccc_object *clobj = cl2ccc(obj);
-
-                        LASSERT(!TRYLOCK_INODE_MUTEX(clobj->cob_inode));
-                        cl_page_slice_add(page, &cpg->cpg_cl, obj,
-                                          &vvp_transient_page_ops);
-                        clobj->cob_transient_pages++;
-                }
-                result = 0;
-        } else
-                result = -ENOMEM;
-        return ERR_PTR(result);
+       struct vvp_page *vpg = cl_object_page_slice(obj, page);
+       struct page     *vmpage = page->cp_vmpage;
+
+       CLOBINVRNT(env, obj, vvp_object_invariant(obj));
+
+       vpg->vpg_page = vmpage;
+       get_page(vmpage);
+
+       if (page->cp_type == CPT_CACHEABLE) {
+               /* in cache, decref in vvp_page_delete */
+               atomic_inc(&page->cp_ref);
+               SetPagePrivate(vmpage);
+               vmpage->private = (unsigned long)page;
+               cl_page_slice_add(page, &vpg->vpg_cl, obj, index,
+                               &vvp_page_ops);
+       } else {
+               struct vvp_object *clobj = cl2vvp(obj);
+
+               cl_page_slice_add(page, &vpg->vpg_cl, obj, index,
+                               &vvp_transient_page_ops);
+               atomic_inc(&clobj->vob_transient_pages);
+       }
+       return 0;
 }
-