X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Fvvp_io.c;h=6d752b9128f0e5b3c0d0851afb7dfc637a0c1ceb;hp=b014b4fd00b511ce3a4a1a4313eda6d4e262e077;hb=65e391e95b6d53b36840c95c2499f17fd84a1d36;hpb=da59e9d89a911b523e729961a46e7677e5bba9c0

diff --git a/lustre/llite/vvp_io.c b/lustre/llite/vvp_io.c
index b014b4f..6d752b9 100644
--- a/lustre/llite/vvp_io.c
+++ b/lustre/llite/vvp_io.c
@@ -952,6 +952,21 @@ static int vvp_io_commit_sync(const struct lu_env *env, struct cl_io *io,
 }
 
 /*
+ * From kernel v4.19-rc5-248-g9b89a0355144 use XArrary
+ * Prior kernels use radix_tree for tags
+ */
+static inline void ll_page_tag_dirty(struct page *page,
+				     struct address_space *mapping)
+{
+#ifndef HAVE_RADIX_TREE_TAG_SET
+	__xa_set_mark(&mapping->i_pages, page_index(page), PAGECACHE_TAG_DIRTY);
+#else
+	radix_tree_tag_set(&mapping->page_tree, page_index(page),
+			   PAGECACHE_TAG_DIRTY);
+#endif
+}
+
+/*
  * Kernels 4.2 - 4.5 pass memcg argument to account_page_dirtied()
  * Kernel v5.2-5678-gac1c3e4 no longer exports account_page_dirtied
  */
@@ -966,24 +981,9 @@ static inline void ll_account_page_dirtied(struct page *page,
 #elif defined(HAVE_ACCOUNT_PAGE_DIRTIED_EXPORT)
 	account_page_dirtied(page, mapping);
 #else
-	if (vvp_account_page_dirtied)
-		vvp_account_page_dirtied(page, mapping);
-#endif
-}
-
-/*
- * From kernel v4.19-rc5-248-g9b89a0355144 use XArrary
- * Prior kernels use radix_tree for tags
- */
-static inline void ll_page_tag_dirty(struct page *page,
-				     struct address_space *mapping)
-{
-#ifndef HAVE_RADIX_TREE_TAG_SET
-	__xa_set_mark(&mapping->i_pages, page_index(page), PAGECACHE_TAG_DIRTY);
-#else
-	radix_tree_tag_set(&mapping->page_tree, page_index(page),
-			   PAGECACHE_TAG_DIRTY);
+	vvp_account_page_dirtied(page, mapping);
 #endif
+	ll_page_tag_dirty(page, mapping);
 }
 
 /* Taken from kernel set_page_dirty, __set_page_dirty_nobuffers
@@ -1049,7 +1049,6 @@ void vvp_set_pagevec_dirty(struct pagevec *pvec)
 			 page, page->mapping, mapping);
 		WARN_ON_ONCE(!PagePrivate(page) && !PageUptodate(page));
 		ll_account_page_dirtied(page, mapping);
-		ll_page_tag_dirty(page, mapping);
 		dirtied++;
 		unlock_page_memcg(page);
 	}