--- reiser4-for-4.5.0.patch     2016-03-30 09:09:26.000000000 -0600
+++ reiser4-for-4.6.0.patch     2016-03-30 19:08:20.786799283 -0600
@@ -220,8 +220,8 @@
                spin_lock(&inode->i_lock);
                if (!(inode->i_state & I_DIRTY_ALL))
                        wrote++;
--              requeue_inode(inode, wb, &wbc);
-+              requeue_inode(inode, wb, wbc);
+-              requeue_inode(inode, tmp_wb, &wbc);
++              requeue_inode(inode, tmp_wb, wbc);
                inode_sync_complete(inode);
                spin_unlock(&inode->i_lock);

@@ -81041,7 +81041,7 @@
 diff -urN linux-4.5.orig/mm/page-writeback.c linux-4.5/mm/page-writeback.c
 --- linux-4.5.orig/mm/page-writeback.c 2016-03-14 05:28:54.000000000 +0100
 +++ linux-4.5/mm/page-writeback.c      2016-03-24 16:58:16.396833377 +0100
-@@ -2526,6 +2526,36 @@
+@@ -2526,6 +2526,35 @@
  EXPORT_SYMBOL(account_page_redirty);

  /*
@@ -81055,21 +81055,20 @@
 + */
 +int set_page_dirty_notag(struct page *page)
 +{
-+      struct mem_cgroup *memcg;
 +      struct address_space *mapping = page->mapping;
 +
-+      memcg = mem_cgroup_begin_page_stat(page);
++      lock_page_memcg(page);
 +      if (!TestSetPageDirty(page)) {
 +              unsigned long flags;
 +              WARN_ON_ONCE(!PagePrivate(page) && !PageUptodate(page));
 +              local_irq_save(flags);
-+              account_page_dirtied(page, mapping, memcg);
++              account_page_dirtied(page, mapping);
 +              local_irq_restore(flags);
-+              mem_cgroup_end_page_stat(memcg);
++              unlock_page_memcg(page);
 +              __mark_inode_dirty(mapping->host, I_DIRTY_PAGES);
 +              return 1;
 +      }
-+      mem_cgroup_end_page_stat(memcg);
++      unlock_page_memcg(page);
 +      return 0;
 +}
 +EXPORT_SYMBOL(set_page_dirty_notag);