Commit a8fb49c6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Andrew Morton
Browse files

mm: remove the for_reclaim field from struct writeback_control 

This field is now only set to one in the i915 gem code that only calls
writeback_iter on it, which ignores the flag.  All other checks are thuse
dead code and the field can be removed.

Link: https://lkml.kernel.org/r/20250610054959.2057526-7-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Nhat Pham <nphamcs@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 624043db

drivers/gpu/drm/i915/gem/i915_gem_shmem.c

+0 −1
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ void __shmem_writeback(size_t size, struct address_space *mapping) 
		.nr_to_write = SWAP_CLUSTER_MAX,

		.range_start = 0,

		.range_end = LLONG_MAX,

		.for_reclaim = 1,

	};

	struct folio *folio = NULL;

	int error = 0;

fs/fuse/file.c

+0 −11
Original line number Diff line number Diff line
@@ -1927,17 +1927,6 @@ int fuse_write_inode(struct inode *inode, struct writeback_control *wbc) 
	struct fuse_file *ff;

	int err;



	/*

	 * Inode is always written before the last reference is dropped and

	 * hence this should not be reached from reclaim.

	 *

	 * Writing back the inode from reclaim can deadlock if the request

	 * processing itself needs an allocation.  Allocations triggering

	 * reclaim while serving a request can't be prevented, because it can

	 * involve any number of unrelated userspace processes.

	 */

	WARN_ON(wbc->for_reclaim);



	ff = __fuse_write_file_get(fi);

	err = fuse_flush_times(inode, ff);

	if (ff)

fs/nfs/write.c

+1 −1
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc) 
	nfs_inc_stats(inode, NFSIOS_VFSWRITEPAGES);



	if (!(mntflags & NFS_MOUNT_WRITE_EAGER) || wbc->for_kupdate ||

	    wbc->for_background || wbc->for_sync || wbc->for_reclaim) {

	    wbc->for_background || wbc->for_sync) {

		ioc = nfs_io_completion_alloc(GFP_KERNEL);

		if (ioc)

			nfs_io_completion_init(ioc, nfs_io_completion_commit,

include/linux/writeback.h

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ struct writeback_control { 
	unsigned for_kupdate:1;		/* A kupdate writeback */

	unsigned for_background:1;	/* A background writeback */

	unsigned tagged_writepages:1;	/* tag-and-write to avoid livelock */

	unsigned for_reclaim:1;		/* Invoked from the page allocator */

	unsigned range_cyclic:1;	/* range_start is cyclic */

	unsigned for_sync:1;		/* sync(2) WB_SYNC_ALL writeback */

	unsigned unpinned_netfs_wb:1;	/* Cleared I_PINNING_NETFS_WB */

include/trace/events/btrfs.h

+2 −5
Original line number Diff line number Diff line
@@ -686,7 +686,6 @@ DECLARE_EVENT_CLASS(btrfs__writepage, 
		__field(	loff_t, range_start		)

		__field(	loff_t, range_end		)

		__field(	char,   for_kupdate		)

		__field(	char,   for_reclaim		)

		__field(	char,   range_cyclic		)

		__field(	unsigned long,  writeback_index	)

		__field(	u64,    root_objectid		)
@@ -700,7 +699,6 @@ DECLARE_EVENT_CLASS(btrfs__writepage, 
		__entry->range_start	= wbc->range_start;

		__entry->range_end	= wbc->range_end;

		__entry->for_kupdate	= wbc->for_kupdate;

		__entry->for_reclaim	= wbc->for_reclaim;

		__entry->range_cyclic	= wbc->range_cyclic;

		__entry->writeback_index = inode->i_mapping->writeback_index;

		__entry->root_objectid	= btrfs_root_id(BTRFS_I(inode)->root);
@@ -709,13 +707,12 @@ DECLARE_EVENT_CLASS(btrfs__writepage, 
	TP_printk_btrfs("root=%llu(%s) ino=%llu page_index=%lu "

		  "nr_to_write=%ld pages_skipped=%ld range_start=%llu "

		  "range_end=%llu for_kupdate=%d "

		  "for_reclaim=%d range_cyclic=%d writeback_index=%lu",

		  "range_cyclic=%d writeback_index=%lu",

		  show_root_type(__entry->root_objectid),

		  __entry->ino, __entry->index,

		  __entry->nr_to_write, __entry->pages_skipped,

		  __entry->range_start, __entry->range_end,

		  __entry->for_kupdate,

		  __entry->for_reclaim, __entry->range_cyclic,

		  __entry->for_kupdate, __entry->range_cyclic,

		  __entry->writeback_index)

);