Commit 846d5a09 authored by Wu Fengguang's avatar Wu Fengguang
Browse files

writeback: remove .nonblocking and .encountered_congestion 



Remove two unused struct writeback_control fields:

	.encountered_congestion	(completely unused)
	.nonblocking		(never set, checked/showed in XFS,NFS/btrfs)

The .for_background check in nfs_write_inode() is also removed btw,
as .for_background implies WB_SYNC_NONE.

Reviewed-by: default avatarJan Kara <jack@suse.cz>
Proposed-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarWu Fengguang <fengguang.wu@intel.com>
parent b7a2441f

fs/nfs/write.c

+1 −2
Original line number Diff line number Diff line
@@ -1564,8 +1564,7 @@ int nfs_write_inode(struct inode *inode, struct writeback_control *wbc) 
		int status;

		bool sync = true;



		if (wbc->sync_mode == WB_SYNC_NONE || wbc->nonblocking ||

		    wbc->for_background)

		if (wbc->sync_mode == WB_SYNC_NONE)

			sync = false;



		status = pnfs_layoutcommit_inode(inode, sync);

fs/xfs/linux-2.6/xfs_aops.c

+1 −1
Original line number Diff line number Diff line
@@ -970,7 +970,7 @@ xfs_vm_writepage( 
	offset = page_offset(page);

	type = IO_OVERWRITE;



	if (wbc->sync_mode == WB_SYNC_NONE && wbc->nonblocking)

	if (wbc->sync_mode == WB_SYNC_NONE)

		nonblocking = 1;



	do {

include/linux/writeback.h

+0 −2
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ struct writeback_control { 
	loff_t range_start;

	loff_t range_end;



	unsigned nonblocking:1;		/* Don't get stuck on request queues */

	unsigned encountered_congestion:1; /* An output: a queue is full */

	unsigned for_kupdate:1;		/* A kupdate writeback */

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

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

include/trace/events/btrfs.h

+2 −4
Original line number Diff line number Diff line
@@ -284,7 +284,6 @@ DECLARE_EVENT_CLASS(btrfs__writepage, 
		__field(	long,   pages_skipped		)

		__field(	loff_t, range_start		)

		__field(	loff_t, range_end		)

		__field(	char,   nonblocking		)

		__field(	char,   for_kupdate		)

		__field(	char,   for_reclaim		)

		__field(	char,   range_cyclic		)
@@ -299,7 +298,6 @@ DECLARE_EVENT_CLASS(btrfs__writepage, 
		__entry->pages_skipped	= wbc->pages_skipped;

		__entry->range_start	= wbc->range_start;

		__entry->range_end	= wbc->range_end;

		__entry->nonblocking	= wbc->nonblocking;

		__entry->for_kupdate	= wbc->for_kupdate;

		__entry->for_reclaim	= wbc->for_reclaim;

		__entry->range_cyclic	= wbc->range_cyclic;
@@ -310,13 +308,13 @@ DECLARE_EVENT_CLASS(btrfs__writepage, 


	TP_printk("root = %llu(%s), ino = %lu, page_index = %lu, "

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

		  "range_end = %llu, nonblocking = %d, for_kupdate = %d, "

		  "range_end = %llu, for_kupdate = %d, "

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

		  show_root_type(__entry->root_objectid),

		  (unsigned long)__entry->ino, __entry->index,

		  __entry->nr_to_write, __entry->pages_skipped,

		  __entry->range_start, __entry->range_end,

		  __entry->nonblocking, __entry->for_kupdate,

		  __entry->for_kupdate,

		  __entry->for_reclaim, __entry->range_cyclic,

		  (unsigned long)__entry->writeback_index)

);

CRA Git | Maintained and supported by SUSTech CRA and CCSE