LU-812 kernel: sync_page() removed from address_space_operations

[fs/lustre-release.git] / lustre / llite / rw26.c

diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c
index 6cbf9e0..661ae5b 100644 (file)
--- a/lustre/llite/rw26.c
+++ b/lustre/llite/rw26.c
@@ -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.
@@ -29,8 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011 Whamcloud, Inc.
- *
+ * Copyright (c) 2011, 2012, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -80,14 +77,13 @@
  * aligned truncate). Lustre leaves partially truncated page in the cache,
  * relying on struct inode::i_size to limit further accesses.
  */
-static int cl_invalidatepage(struct page *vmpage, unsigned long offset)
+static void ll_invalidatepage(struct page *vmpage, unsigned long offset)
 {
         struct inode     *inode;
         struct lu_env    *env;
         struct cl_page   *page;
         struct cl_object *obj;
 
-        int result;
         int refcheck;
 
         LASSERT(PageLocked(vmpage));
@@ -98,7 +94,6 @@ static int cl_invalidatepage(struct page *vmpage, unsigned long offset)
          * below because they are run with page locked and all our io is
          * happening with locked page too
          */
-        result = 0;
         if (offset == 0) {
                 env = cl_env_get(&refcheck);
                 if (!IS_ERR(env)) {
@@ -110,7 +105,6 @@ static int cl_invalidatepage(struct page *vmpage, unsigned long offset)
                                         lu_ref_add(&page->cp_reference,
                                                    "delete", vmpage);
                                         cl_page_delete(env, page);
-                                        result = 1;
                                         lu_ref_del(&page->cp_reference,
                                                    "delete", vmpage);
                                         cl_page_put(env, page);
@@ -120,34 +114,58 @@ static int cl_invalidatepage(struct page *vmpage, unsigned long offset)
                         cl_env_put(env, &refcheck);
                 }
         }
-        return result;
-}
-
-#ifdef HAVE_INVALIDATEPAGE_RETURN_INT
-static int ll_invalidatepage(struct page *page, unsigned long offset)
-{
-        return cl_invalidatepage(page, offset);
 }
-#else /* !HAVE_INVALIDATEPAGE_RETURN_INT */
-static void ll_invalidatepage(struct page *page, unsigned long offset)
-{
-        cl_invalidatepage(page, offset);
-}
-#endif
 
 #ifdef HAVE_RELEASEPAGE_WITH_INT
 #define RELEASEPAGE_ARG_TYPE int
 #else
 #define RELEASEPAGE_ARG_TYPE gfp_t
 #endif
-static int ll_releasepage(struct page *page, RELEASEPAGE_ARG_TYPE gfp_mask)
+static int ll_releasepage(struct page *vmpage, RELEASEPAGE_ARG_TYPE gfp_mask)
 {
-        void *cookie;
+        struct cl_env_nest nest;
+        struct lu_env     *env;
+        struct cl_object  *obj;
+        struct cl_page    *page;
+        struct address_space *mapping;
+        int result;
 
-        cookie = cl_env_reenter();
-        ll_invalidatepage(page, 0);
-        cl_env_reexit(cookie);
-        return 1;
+        LASSERT(PageLocked(vmpage));
+        if (PageWriteback(vmpage) || PageDirty(vmpage))
+                return 0;
+
+        mapping = vmpage->mapping;
+        if (mapping == NULL)
+                return 1;
+
+        obj = ll_i2info(mapping->host)->lli_clob;
+        if (obj == NULL)
+                return 1;
+
+        /* 1 for page allocator, 1 for cl_page and 1 for page cache */
+        if (page_count(vmpage) > 3)
+                return 0;
+
+        /* TODO: determine what gfp should be used by @gfp_mask. */
+        env = cl_env_nested_get(&nest);
+        if (IS_ERR(env))
+                /* If we can't allocate an env we won't call cl_page_put()
+                 * later on which further means it's impossible to drop
+                 * page refcount by cl_page, so ask kernel to not free
+                 * this page. */
+                return 0;
+
+        page = cl_vmpage_page(vmpage, obj);
+        result = page == NULL;
+        if (page != NULL) {
+                if (cfs_atomic_read(&page->cp_ref) == 1) {
+                        result = 1;
+                        cl_page_delete(env, page);
+                }
+                cl_page_put(env, page);
+        }
+        cl_env_nested_put(&nest, env);
+        return result;
 }
 
 static int ll_set_page_dirty(struct page *vmpage)
@@ -537,7 +555,6 @@ struct address_space_operations ll_aops = {
         .writepage      = ll_writepage,
         .writepages     = generic_writepages,
         .set_page_dirty = ll_set_page_dirty,
-        .sync_page      = NULL,
 #ifdef HAVE_KERNEL_WRITE_BEGIN_END
         .write_begin    = ll_write_begin,
         .write_end      = ll_write_end,
@@ -560,7 +577,6 @@ struct address_space_operations_ext ll_aops = {
         .orig_aops.writepage      = ll_writepage,
         .orig_aops.writepages     = generic_writepages,
         .orig_aops.set_page_dirty = ll_set_page_dirty,
-        .orig_aops.sync_page      = NULL,
         .orig_aops.prepare_write  = ll_prepare_write,
         .orig_aops.commit_write   = ll_commit_write,
         .orig_aops.invalidatepage = ll_invalidatepage,