Whamcloud - gitweb
LU-4540 llite: deadlock for page write
[fs/lustre-release.git] / lustre / llite / rw26.c
index ad4d86f..447dc43 100644 (file)
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- * Lustre Lite I/O page cache routines for the 2.5/2.6 kernel version
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * 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
  *
- *  Copyright (c) 2001-2003 Cluster File Systems, Inc.
+ * 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.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * Copyright (c) 2011, 2012, Intel Corporation.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * lustre/lustre/llite/rw26.c
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Lustre Lite I/O page cache routines for the 2.5/2.6 kernel version
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/smp_lock.h>
 #include <linux/unistd.h>
-#include <linux/version.h>
-#include <asm/system.h>
 #include <asm/uaccess.h>
 
+#ifdef HAVE_MIGRATE_H
+#include <linux/migrate.h>
+#elif defined(HAVE_MIGRATE_MODE_H)
+#include <linux/migrate_mode.h>
+#endif
 #include <linux/fs.h>
 #include <linux/buffer_head.h>
 #include <linux/mpage.h>
 #include <linux/writeback.h>
 #include <linux/stat.h>
 #include <asm/uaccess.h>
-#include <asm/segment.h>
 #include <linux/mm.h>
 #include <linux/pagemap.h>
-#include <linux/smp_lock.h>
-#include <linux/writeback.h>
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
-#include <linux/lustre_mds.h>
-#include <linux/lustre_lite.h>
+#include <lustre_lite.h>
 #include "llite_internal.h"
 #include <linux/lustre_compat25.h>
 
-static int ll_writepage_26(struct page *page, struct writeback_control *wbc)
+/**
+ * Implements Linux VM address_space::invalidatepage() method. This method is
+ * called when the page is truncate from a file, either as a result of
+ * explicit truncate, or when inode is removed from memory (as a result of
+ * final iput(), umount, or memory pressure induced icache shrinking).
+ *
+ * [0, offset] bytes of the page remain valid (this is for a case of not-page
+ * aligned truncate). Lustre leaves partially truncated page in the cache,
+ * relying on struct inode::i_size to limit further accesses.
+ */
+static void ll_invalidatepage(struct page *vmpage, unsigned long offset)
 {
-        return ll_writepage(page);
+        struct inode     *inode;
+        struct lu_env    *env;
+        struct cl_page   *page;
+        struct cl_object *obj;
+
+        int refcheck;
+
+        LASSERT(PageLocked(vmpage));
+        LASSERT(!PageWriteback(vmpage));
+
+        /*
+         * It is safe to not check anything in invalidatepage/releasepage
+         * below because they are run with page locked and all our io is
+         * happening with locked page too
+         */
+        if (offset == 0) {
+                env = cl_env_get(&refcheck);
+                if (!IS_ERR(env)) {
+                        inode = vmpage->mapping->host;
+                        obj = ll_i2info(inode)->lli_clob;
+                        if (obj != NULL) {
+                                page = cl_vmpage_page(vmpage, obj);
+                                if (page != NULL) {
+                                        cl_page_delete(env, page);
+                                        cl_page_put(env, page);
+                                }
+                        } else
+                                LASSERT(vmpage->private == 0);
+                        cl_env_put(env, &refcheck);
+                }
+        }
 }
 
-/* It is safe to not check anything in invalidatepage/releasepage below
-   because they are run with page locked and all our io is happening with
-   locked page too */
-static int ll_invalidatepage(struct page *page, unsigned long offset)
+#ifdef HAVE_RELEASEPAGE_WITH_INT
+#define RELEASEPAGE_ARG_TYPE int
+#else
+#define RELEASEPAGE_ARG_TYPE gfp_t
+#endif
+static int ll_releasepage(struct page *vmpage, RELEASEPAGE_ARG_TYPE gfp_mask)
 {
-       if (offset)
+       struct lu_env           *env;
+       void                    *cookie;
+       struct cl_object        *obj;
+       struct cl_page          *page;
+       struct address_space    *mapping;
+       int result = 0;
+
+       LASSERT(PageLocked(vmpage));
+       if (PageWriteback(vmpage) || PageDirty(vmpage))
                return 0;
-        if (PagePrivate(page))
-                ll_removepage(page);
-        return 1;
+
+       mapping = vmpage->mapping;
+       if (mapping == NULL)
+               return 1;
+
+       obj = ll_i2info(mapping->host)->lli_clob;
+       if (obj == NULL)
+               return 1;
+
+       /* 1 for caller, 1 for cl_page and 1 for page cache */
+       if (page_count(vmpage) > 3)
+               return 0;
+
+       page = cl_vmpage_page(vmpage, obj);
+       if (page == NULL)
+               return 1;
+
+       cookie = cl_env_reenter();
+       env = cl_env_percpu_get();
+       LASSERT(!IS_ERR(env));
+
+       if (!cl_page_in_use(page)) {
+               result = 1;
+               cl_page_delete(env, page);
+       }
+
+       /* To use percpu env array, the call path can not be rescheduled;
+        * otherwise percpu array will be messed if ll_releaspage() called
+        * again on the same CPU.
+        *
+        * If this page holds the last refc of cl_object, the following
+        * call path may cause reschedule:
+        *   cl_page_put -> cl_page_free -> cl_object_put ->
+        *     lu_object_put -> lu_object_free -> lov_delete_raid0 ->
+        *     cl_locks_prune.
+        *
+        * However, the kernel can't get rid of this inode until all pages have
+        * been cleaned up. Now that we hold page lock here, it's pretty safe
+        * that we won't get into object delete path.
+        */
+       LASSERT(cl_object_refc(obj) > 1);
+       cl_page_put(env, page);
+
+       cl_env_percpu_put(env);
+       cl_env_reexit(cookie);
+       return result;
 }
 
-static int ll_releasepage(struct page *page, int gfp_mask)
+#define MAX_DIRECTIO_SIZE 2*1024*1024*1024UL
+
+static inline int ll_get_user_pages(int rw, unsigned long user_addr,
+                                    size_t size, struct page ***pages,
+                                    int *max_pages)
 {
-        if (PagePrivate(page))
-                ll_removepage(page);
-        return 1;
+        int result = -ENOMEM;
+
+        /* set an arbitrary limit to prevent arithmetic overflow */
+        if (size > MAX_DIRECTIO_SIZE) {
+                *pages = NULL;
+                return -EFBIG;
+        }
+
+       *max_pages = (user_addr + size + PAGE_CACHE_SIZE - 1) >>
+                    PAGE_CACHE_SHIFT;
+       *max_pages -= user_addr >> PAGE_CACHE_SHIFT;
+
+        OBD_ALLOC_LARGE(*pages, *max_pages * sizeof(**pages));
+        if (*pages) {
+                down_read(&current->mm->mmap_sem);
+                result = get_user_pages(current, current->mm, user_addr,
+                                        *max_pages, (rw == READ), 0, *pages,
+                                        NULL);
+                up_read(&current->mm->mmap_sem);
+                if (unlikely(result <= 0))
+                        OBD_FREE_LARGE(*pages, *max_pages * sizeof(**pages));
+        }
+
+        return result;
+}
+
+/*  ll_free_user_pages - tear down page struct array
+ *  @pages: array of page struct pointers underlying target buffer */
+static void ll_free_user_pages(struct page **pages, int npages, int do_dirty)
+{
+        int i;
+
+        for (i = 0; i < npages; i++) {
+                if (pages[i] == NULL)
+                        break;
+                if (do_dirty)
+                        set_page_dirty_lock(pages[i]);
+                page_cache_release(pages[i]);
+        }
+
+        OBD_FREE_LARGE(pages, npages * sizeof(*pages));
 }
 
-static int ll_writepages(struct address_space *mapping,
-                         struct writeback_control *wbc)
+ssize_t ll_direct_rw_pages(const struct lu_env *env, struct cl_io *io,
+                           int rw, struct inode *inode,
+                           struct ll_dio_pages *pv)
 {
-        struct timeval tstart, now;
-        int rc;
-        do_gettimeofday(&tstart);
-        rc =  generic_writepages(mapping, wbc);
-        if (rc == 0 && wbc->sync_mode == WB_SYNC_ALL) {
-                /* as we don't use Writeback bit to track pages
-                 * under I/O, filemap_fdatawait() doesn't work
-                 * for us. let's wait for I/O completion here */
-                struct ll_inode_info *lli = ll_i2info(mapping->host);
-                wait_event(lli->lli_dirty_wait,
-                           ll_is_inode_dirty(mapping->host) == 0);
-                do_gettimeofday(&now);
-                if (now.tv_sec - tstart.tv_sec > obd_timeout) {
-                        CDEBUG(D_ERROR, "synching inode 0x%p "DLID4" took %ds\n",
-                               mapping->host, OLID4(&lli->lli_id),
-                               (int) (now.tv_sec - tstart.tv_sec));
-                        portals_debug_dumplog();
+        struct cl_page    *clp;
+        struct cl_2queue  *queue;
+        struct cl_object  *obj = io->ci_obj;
+        int i;
+        ssize_t rc = 0;
+        loff_t file_offset  = pv->ldp_start_offset;
+        long size           = pv->ldp_size;
+        int page_count      = pv->ldp_nr;
+        struct page **pages = pv->ldp_pages;
+        long page_size      = cl_page_size(obj);
+        bool do_io;
+        int  io_pages       = 0;
+        ENTRY;
+
+        queue = &io->ci_queue;
+        cl_2queue_init(queue);
+        for (i = 0; i < page_count; i++) {
+                if (pv->ldp_offsets)
+                    file_offset = pv->ldp_offsets[i];
+
+                LASSERT(!(file_offset & (page_size - 1)));
+                clp = cl_page_find(env, obj, cl_index(obj, file_offset),
+                                   pv->ldp_pages[i], CPT_TRANSIENT);
+                if (IS_ERR(clp)) {
+                        rc = PTR_ERR(clp);
+                        break;
+                }
+
+                rc = cl_page_own(env, io, clp);
+                if (rc) {
+                        LASSERT(clp->cp_state == CPS_FREEING);
+                        cl_page_put(env, clp);
+                        break;
+                }
+
+                do_io = true;
+
+                /* check the page type: if the page is a host page, then do
+                 * write directly */
+                if (clp->cp_type == CPT_CACHEABLE) {
+                       struct page *vmpage = cl_page_vmpage(clp);
+                       struct page *src_page;
+                       struct page *dst_page;
+                        void       *src;
+                        void       *dst;
+
+                        src_page = (rw == WRITE) ? pages[i] : vmpage;
+                        dst_page = (rw == WRITE) ? vmpage : pages[i];
+
+                        src = ll_kmap_atomic(src_page, KM_USER0);
+                        dst = ll_kmap_atomic(dst_page, KM_USER1);
+                        memcpy(dst, src, min(page_size, size));
+                        ll_kunmap_atomic(dst, KM_USER1);
+                        ll_kunmap_atomic(src, KM_USER0);
+
+                        /* make sure page will be added to the transfer by
+                         * cl_io_submit()->...->vvp_page_prep_write(). */
+                        if (rw == WRITE)
+                                set_page_dirty(vmpage);
+
+                        if (rw == READ) {
+                                /* do not issue the page for read, since it
+                                 * may reread a ra page which has NOT uptodate
+                                 * bit set. */
+                                cl_page_disown(env, io, clp);
+                                do_io = false;
+                        }
+                }
+
+                if (likely(do_io)) {
+                        cl_2queue_add(queue, clp);
+
+                        /*
+                         * Set page clip to tell transfer formation engine
+                         * that page has to be sent even if it is beyond KMS.
+                         */
+                        cl_page_clip(env, clp, 0, min(size, page_size));
+
+                        ++io_pages;
                 }
+
+                /* drop the reference count for cl_page_find */
+                cl_page_put(env, clp);
+                size -= page_size;
+                file_offset += page_size;
         }
-        return rc;
+
+        if (rc == 0 && io_pages) {
+                rc = cl_io_submit_sync(env, io,
+                                       rw == READ ? CRT_READ : CRT_WRITE,
+                                      queue, 0);
+        }
+        if (rc == 0)
+                rc = pv->ldp_size;
+
+        cl_2queue_discard(env, io, queue);
+        cl_2queue_disown(env, io, queue);
+        cl_2queue_fini(env, queue);
+        RETURN(rc);
+}
+EXPORT_SYMBOL(ll_direct_rw_pages);
+
+static ssize_t ll_direct_IO_26_seg(const struct lu_env *env, struct cl_io *io,
+                                   int rw, struct inode *inode,
+                                   struct address_space *mapping,
+                                   size_t size, loff_t file_offset,
+                                   struct page **pages, int page_count)
+{
+    struct ll_dio_pages pvec = { .ldp_pages        = pages,
+                                 .ldp_nr           = page_count,
+                                 .ldp_size         = size,
+                                 .ldp_offsets      = NULL,
+                                 .ldp_start_offset = file_offset
+                               };
+
+    return ll_direct_rw_pages(env, io, rw, inode, &pvec);
 }
 
+#ifdef KMALLOC_MAX_SIZE
+#define MAX_MALLOC KMALLOC_MAX_SIZE
+#else
+#define MAX_MALLOC (128 * 1024)
+#endif
+
+/* This is the maximum size of a single O_DIRECT request, based on the
+ * kmalloc limit.  We need to fit all of the brw_page structs, each one
+ * representing PAGE_SIZE worth of user data, into a single buffer, and
+ * then truncate this to be a full-sized RPC.  For 4kB PAGE_SIZE this is
+ * up to 22MB for 128kB kmalloc and up to 682MB for 4MB kmalloc. */
+#define MAX_DIO_SIZE ((MAX_MALLOC / sizeof(struct brw_page) * PAGE_CACHE_SIZE) & \
+                     ~(DT_MAX_BRW_SIZE - 1))
+static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,
+                               const struct iovec *iov, loff_t file_offset,
+                               unsigned long nr_segs)
+{
+        struct lu_env *env;
+        struct cl_io *io;
+        struct file *file = iocb->ki_filp;
+        struct inode *inode = file->f_mapping->host;
+        struct ccc_object *obj = cl_inode2ccc(inode);
+        long count = iov_length(iov, nr_segs);
+        long tot_bytes = 0, result = 0;
+        struct ll_inode_info *lli = ll_i2info(inode);
+        unsigned long seg = 0;
+        long size = MAX_DIO_SIZE;
+        int refcheck;
+        ENTRY;
+
+       if (!lli->lli_has_smd)
+                RETURN(-EBADF);
+
+        /* FIXME: io smaller than PAGE_SIZE is broken on ia64 ??? */
+        if ((file_offset & ~CFS_PAGE_MASK) || (count & ~CFS_PAGE_MASK))
+                RETURN(-EINVAL);
+
+       CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p), size=%lu (max %lu), "
+              "offset=%lld=%llx, pages %lu (max %lu)\n",
+              PFID(ll_inode2fid(inode)), inode, count, MAX_DIO_SIZE,
+              file_offset, file_offset, count >> PAGE_CACHE_SHIFT,
+              MAX_DIO_SIZE >> PAGE_CACHE_SHIFT);
+
+        /* Check that all user buffers are aligned as well */
+        for (seg = 0; seg < nr_segs; seg++) {
+                if (((unsigned long)iov[seg].iov_base & ~CFS_PAGE_MASK) ||
+                    (iov[seg].iov_len & ~CFS_PAGE_MASK))
+                        RETURN(-EINVAL);
+        }
+
+        env = cl_env_get(&refcheck);
+        LASSERT(!IS_ERR(env));
+        io = ccc_env_io(env)->cui_cl.cis_io;
+        LASSERT(io != NULL);
+
+       /* 0. Need locking between buffered and direct access. and race with
+        *    size changing by concurrent truncates and writes.
+        * 1. Need inode mutex to operate transient pages.
+        */
+       if (rw == READ)
+               mutex_lock(&inode->i_mutex);
+
+        LASSERT(obj->cob_transient_pages == 0);
+        for (seg = 0; seg < nr_segs; seg++) {
+                long iov_left = iov[seg].iov_len;
+                unsigned long user_addr = (unsigned long)iov[seg].iov_base;
+
+                if (rw == READ) {
+                        if (file_offset >= i_size_read(inode))
+                                break;
+                        if (file_offset + iov_left > i_size_read(inode))
+                                iov_left = i_size_read(inode) - file_offset;
+                }
+
+                while (iov_left > 0) {
+                        struct page **pages;
+                        int page_count, max_pages = 0;
+                        long bytes;
+
+                        bytes = min(size, iov_left);
+                        page_count = ll_get_user_pages(rw, user_addr, bytes,
+                                                       &pages, &max_pages);
+                        if (likely(page_count > 0)) {
+                                if (unlikely(page_count <  max_pages))
+                                       bytes = page_count << PAGE_CACHE_SHIFT;
+                                result = ll_direct_IO_26_seg(env, io, rw, inode,
+                                                             file->f_mapping,
+                                                             bytes, file_offset,
+                                                             pages, page_count);
+                                ll_free_user_pages(pages, max_pages, rw==READ);
+                        } else if (page_count == 0) {
+                                GOTO(out, result = -EFAULT);
+                        } else {
+                                result = page_count;
+                        }
+                        if (unlikely(result <= 0)) {
+                                /* If we can't allocate a large enough buffer
+                                 * for the request, shrink it to a smaller
+                                 * PAGE_SIZE multiple and try again.
+                                 * We should always be able to kmalloc for a
+                                 * page worth of page pointers = 4MB on i386. */
+                                if (result == -ENOMEM &&
+                                   size > (PAGE_CACHE_SIZE / sizeof(*pages)) *
+                                          PAGE_CACHE_SIZE) {
+                                        size = ((((size / 2) - 1) |
+                                                 ~CFS_PAGE_MASK) + 1) &
+                                                CFS_PAGE_MASK;
+                                        CDEBUG(D_VFSTRACE,"DIO size now %lu\n",
+                                               size);
+                                        continue;
+                                }
+
+                                GOTO(out, result);
+                        }
+
+                        tot_bytes += result;
+                        file_offset += result;
+                        iov_left -= result;
+                        user_addr += result;
+                }
+        }
+out:
+       LASSERT(obj->cob_transient_pages == 0);
+       if (rw == READ)
+               mutex_unlock(&inode->i_mutex);
+
+        if (tot_bytes > 0) {
+               struct ccc_io *cio = ccc_env_io(env);
+
+               /* no commit async for direct IO */
+               cio->u.write.cui_written += tot_bytes;
+       }
+
+       cl_env_put(env, &refcheck);
+       RETURN(tot_bytes ? tot_bytes : result);
+}
+
+/**
+ * Prepare partially written-to page for a write.
+ */
+static int ll_prepare_partial_page(const struct lu_env *env, struct cl_io *io,
+                                  struct cl_page *pg)
+{
+       struct cl_attr *attr   = ccc_env_thread_attr(env);
+       struct cl_object *obj  = io->ci_obj;
+       struct ccc_page *cp    = cl_object_page_slice(obj, pg);
+       loff_t          offset = cl_offset(obj, ccc_index(cp));
+       int             result;
+
+       cl_object_attr_lock(obj);
+       result = cl_object_attr_get(env, obj, attr);
+       cl_object_attr_unlock(obj);
+       if (result == 0) {
+               /*
+                * If are writing to a new page, no need to read old data.
+                * The extent locking will have updated the KMS, and for our
+                * purposes here we can treat it like i_size.
+                */
+               if (attr->cat_kms <= offset) {
+                       char *kaddr = ll_kmap_atomic(cp->cpg_page, KM_USER0);
+
+                       memset(kaddr, 0, cl_page_size(obj));
+                       ll_kunmap_atomic(kaddr, KM_USER0);
+               } else if (cp->cpg_defer_uptodate)
+                       cp->cpg_ra_used = 1;
+               else
+                       result = ll_page_sync_io(env, io, pg, CRT_READ);
+       }
+       return result;
+}
+
+static int ll_write_begin(struct file *file, struct address_space *mapping,
+                         loff_t pos, unsigned len, unsigned flags,
+                         struct page **pagep, void **fsdata)
+{
+       struct ll_cl_context *lcc;
+       struct lu_env  *env;
+       struct cl_io   *io;
+       struct cl_page *page;
+
+       struct cl_object *clob = ll_i2info(mapping->host)->lli_clob;
+       pgoff_t index = pos >> PAGE_CACHE_SHIFT;
+       struct page *vmpage = NULL;
+       unsigned from = pos & (PAGE_CACHE_SIZE - 1);
+       unsigned to = from + len;
+       int result = 0;
+       ENTRY;
+
+       CDEBUG(D_VFSTRACE, "Writing %lu of %d to %d bytes\n", index, from, len);
+
+       lcc = ll_cl_init(file, NULL);
+       if (IS_ERR(lcc))
+               GOTO(out, result = PTR_ERR(lcc));
+
+       env = lcc->lcc_env;
+       io  = lcc->lcc_io;
+
+       /* To avoid deadlock, try to lock page first. */
+       vmpage = grab_cache_page_nowait(mapping, index);
+       if (unlikely(vmpage == NULL ||
+                    PageDirty(vmpage) || PageWriteback(vmpage))) {
+               struct ccc_io *cio = ccc_env_io(env);
+               struct cl_page_list *plist = &cio->u.write.cui_queue;
+
+                /* if the page is already in dirty cache, we have to commit
+                * the pages right now; otherwise, it may cause deadlock
+                * because it holds page lock of a dirty page and request for
+                * more grants. It's okay for the dirty page to be the first
+                * one in commit page list, though. */
+               if (vmpage != NULL && plist->pl_nr > 0) {
+                       unlock_page(vmpage);
+                       page_cache_release(vmpage);
+                       vmpage = NULL;
+               }
+
+               /* commit pages and then wait for page lock */
+               result = vvp_io_write_commit(env, io);
+               if (result < 0)
+                       GOTO(out, result);
+
+               if (vmpage == NULL) {
+                       vmpage = grab_cache_page_write_begin(mapping, index,
+                                                            flags);
+                       if (vmpage == NULL)
+                               GOTO(out, result = -ENOMEM);
+               }
+       }
+
+       page = cl_page_find(env, clob, vmpage->index, vmpage, CPT_CACHEABLE);
+       if (IS_ERR(page))
+               GOTO(out, result = PTR_ERR(page));
+
+       lcc->lcc_page = page;
+       lu_ref_add(&page->cp_reference, "cl_io", io);
+
+       cl_page_assume(env, io, page);
+       if (!PageUptodate(vmpage)) {
+               /*
+                * We're completely overwriting an existing page,
+                * so _don't_ set it up to date until commit_write
+                */
+               if (from == 0 && to == PAGE_SIZE) {
+                       CL_PAGE_HEADER(D_PAGE, env, page, "full page write\n");
+                       POISON_PAGE(vmpage, 0x11);
+               } else {
+                       /* TODO: can be optimized at OSC layer to check if it
+                        * is a lockless IO. In that case, it's not necessary
+                        * to read the data. */
+                       result = ll_prepare_partial_page(env, io, page);
+                       if (result == 0)
+                               SetPageUptodate(vmpage);
+               }
+       }
+       if (result < 0)
+               cl_page_unassume(env, io, page);
+       EXIT;
+out:
+       if (result < 0) {
+               if (vmpage != NULL) {
+                       unlock_page(vmpage);
+                       page_cache_release(vmpage);
+               }
+               if (!IS_ERR(lcc))
+                       ll_cl_fini(lcc);
+       } else {
+               *pagep = vmpage;
+               *fsdata = lcc;
+       }
+       RETURN(result);
+}
+
+static int ll_write_end(struct file *file, struct address_space *mapping,
+                       loff_t pos, unsigned len, unsigned copied,
+                       struct page *vmpage, void *fsdata)
+{
+       struct ll_cl_context *lcc = fsdata;
+       struct lu_env *env;
+       struct cl_io *io;
+       struct ccc_io *cio;
+       struct cl_page *page;
+       unsigned from = pos & (PAGE_CACHE_SIZE - 1);
+       bool unplug = false;
+       int result = 0;
+       ENTRY;
+
+       page_cache_release(vmpage);
+
+       LASSERT(lcc != NULL);
+       env  = lcc->lcc_env;
+       page = lcc->lcc_page;
+       io   = lcc->lcc_io;
+       cio  = ccc_env_io(env);
+
+       LASSERT(cl_page_is_owned(page, io));
+       if (copied > 0) {
+               struct cl_page_list *plist = &cio->u.write.cui_queue;
+
+               lcc->lcc_page = NULL; /* page will be queued */
+
+               /* Add it into write queue */
+               cl_page_list_add(plist, page);
+               if (plist->pl_nr == 1) /* first page */
+                       cio->u.write.cui_from = from;
+               else
+                       LASSERT(from == 0);
+               cio->u.write.cui_to = from + copied;
+
+               /* We may have one full RPC, commit it soon */
+               if (plist->pl_nr >= PTLRPC_MAX_BRW_PAGES)
+                       unplug = true;
+
+               CL_PAGE_DEBUG(D_VFSTRACE, env, page,
+                             "queued page: %d.\n", plist->pl_nr);
+       } else {
+               cl_page_disown(env, io, page);
+
+               /* page list is not contiguous now, commit it now */
+               unplug = true;
+       }
+
+       if (unplug ||
+           file->f_flags & O_SYNC || IS_SYNC(file->f_dentry->d_inode))
+               result = vvp_io_write_commit(env, io);
+
+       ll_cl_fini(lcc);
+       RETURN(result >= 0 ? copied : result);
+}
+
+#ifdef CONFIG_MIGRATION
+int ll_migratepage(struct address_space *mapping,
+               struct page *newpage, struct page *page
+#ifdef HAVE_MIGRATEPAGE_4ARGS
+               , enum migrate_mode mode
+#endif
+               )
+{
+        /* Always fail page migration until we have a proper implementation */
+        return -EIO;
+}
+#endif
+
+#ifndef MS_HAS_NEW_AOPS
 struct address_space_operations ll_aops = {
         .readpage       = ll_readpage,
 //        .readpages      = ll_readpages,
-//        .direct_IO      = ll_direct_IO_26,
-        .writepage      = ll_writepage_26,
-        .writepages     = ll_writepages,
+        .direct_IO      = ll_direct_IO_26,
+        .writepage      = ll_writepage,
+       .writepages     = ll_writepages,
         .set_page_dirty = __set_page_dirty_nobuffers,
-        .sync_page      = NULL,
-        .prepare_write  = ll_prepare_write,
-        .commit_write   = ll_commit_write,
+        .write_begin    = ll_write_begin,
+        .write_end      = ll_write_end,
         .invalidatepage = ll_invalidatepage,
-        .releasepage    = ll_releasepage,
+        .releasepage    = (void *)ll_releasepage,
+#ifdef CONFIG_MIGRATION
+        .migratepage    = ll_migratepage,
+#endif
         .bmap           = NULL
 };
+#else
+struct address_space_operations_ext ll_aops = {
+       .orig_aops.readpage             = ll_readpage,
+       .orig_aops.direct_IO            = ll_direct_IO_26,
+       .orig_aops.writepage            = ll_writepage,
+       .orig_aops.writepages           = ll_writepages,
+       .orig_aops.set_page_dirty       = __set_page_dirty_nobuffers,
+       .orig_aops.invalidatepage       = ll_invalidatepage,
+       .orig_aops.releasepage          = ll_releasepage,
+#ifdef CONFIG_MIGRATION
+       .orig_aops.migratepage          = ll_migratepage,
+#endif
+       .orig_aops.bmap                 = NULL,
+       .write_begin                    = ll_write_begin,
+       .write_end                      = ll_write_end
+};
+#endif