[folded-merged] mm-require-set_page_dirty-to-be-explicitly-wire-up-fix.patch removed from -mm tree

[akpm@linux-foundation.org]

The patch titled
     Subject: ecryptfs: add a ->set_page_dirty cludge
has been removed from the -mm tree.  Its filename was
     mm-require-set_page_dirty-to-be-explicitly-wire-up-fix.patch

This patch was dropped because it was folded into mm-require-set_page_dirty-to-be-explicitly-wire-up.patch

------------------------------------------------------
From: Christoph Hellwig <hch@lst.de>
Subject: ecryptfs: add a ->set_page_dirty cludge

"fix" ecryptfs to work the same as before the recent change to the
behavior without a ->set_page_dirty method.

Link: https://lkml.kernel.org/r/20210624125250.536369-1-hch@lst.de
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Tyler Hicks <code@tyhicks.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/ecryptfs/mmap.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)

--- a/fs/ecryptfs/mmap.c~mm-require-set_page_dirty-to-be-explicitly-wire-up-fix
+++ a/fs/ecryptfs/mmap.c
@@ -533,7 +533,20 @@ static sector_t ecryptfs_bmap(struct add
 	return block;
 }
 
+#include <linux/buffer_head.h>
+
 const struct address_space_operations ecryptfs_aops = {
+	/*
+	 * XXX: This is pretty broken for multiple reasons: ecryptfs does not
+	 * actually use buffer_heads, and ecryptfs will crash without
+	 * CONFIG_BLOCK.  But it matches the behavior before the default for
+	 * address_space_operations without the ->set_page_dirty method was
+	 * cleaned up, so this is the best we can do without maintainer
+	 * feedback.
+	 */
+#ifdef CONFIG_BLOCK
+	.set_page_dirty = __set_page_dirty_buffers,
+#endif
 	.writepage = ecryptfs_writepage,
 	.readpage = ecryptfs_readpage,
 	.write_begin = ecryptfs_write_begin,
_

Patches currently in -mm which might be from hch@lst.de are

fs-unexport-__set_page_dirty.patch
fs-move-ramfs_aops-to-libfs.patch
mm-require-set_page_dirty-to-be-explicitly-wire-up.patch