From: Wu Fengguang <fengguang.wu@intel.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Jan Kara <jack@suse.cz>, Wu Fengguang <fengguang.wu@intel.com>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: <linux-fsdevel@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 15/18] writeback: remove .nonblocking and .encountered_congestion
Date: Fri, 20 May 2011 05:45:45 +0800 [thread overview]
Message-ID: <20110519214746.165508083@intel.com> (raw)
In-Reply-To: 20110519214530.939830917@intel.com
[-- Attachment #1: writeback-kill-nonblocking.patch --]
[-- Type: text/plain, Size: 3582 bytes --]
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: Jan Kara <jack@suse.cz>
Proposed-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
fs/nfs/write.c | 3 +--
fs/xfs/linux-2.6/xfs_aops.c | 2 +-
include/linux/writeback.h | 2 --
include/trace/events/btrfs.h | 6 ++----
4 files changed, 4 insertions(+), 9 deletions(-)
--- linux-next.orig/fs/xfs/linux-2.6/xfs_aops.c 2011-05-20 05:08:25.000000000 +0800
+++ linux-next/fs/xfs/linux-2.6/xfs_aops.c 2011-05-20 05:12:47.000000000 +0800
@@ -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 {
--- linux-next.orig/include/trace/events/btrfs.h 2011-05-20 05:08:25.000000000 +0800
+++ linux-next/include/trace/events/btrfs.h 2011-05-20 05:12:47.000000000 +0800
@@ -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)
);
--- linux-next.orig/fs/nfs/write.c 2011-05-20 05:08:25.000000000 +0800
+++ linux-next/fs/nfs/write.c 2011-05-20 05:12:47.000000000 +0800
@@ -1562,8 +1562,7 @@ int nfs_write_inode(struct inode *inode,
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);
--- linux-next.orig/include/linux/writeback.h 2011-05-20 05:12:46.000000000 +0800
+++ linux-next/include/linux/writeback.h 2011-05-20 05:12:47.000000000 +0800
@@ -36,8 +36,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 */
next prev parent reply other threads:[~2011-05-19 21:45 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-19 21:45 [PATCH 00/18] writeback fixes and cleanups for 2.6.40 (v3) Wu Fengguang
2011-05-19 21:45 ` [PATCH 01/18] writeback: introduce .tagged_writepages for the WB_SYNC_NONE sync stage Wu Fengguang
2011-05-19 21:45 ` [PATCH 02/18] writeback: update dirtied_when for synced inode to prevent livelock Wu Fengguang
2011-05-19 21:45 ` [PATCH 03/18] writeback: introduce writeback_control.inodes_cleaned Wu Fengguang
2011-05-19 21:45 ` [PATCH 04/18] writeback: try more writeback as long as something was written Wu Fengguang
2011-05-19 21:45 ` [PATCH 05/18] writeback: the kupdate expire timestamp should be a moving target Wu Fengguang
2011-05-19 21:45 ` [PATCH 06/18] writeback: sync expired inodes first in background writeback Wu Fengguang
2011-05-19 21:45 ` [PATCH 07/18] writeback: refill b_io iff empty Wu Fengguang
2011-05-19 21:45 ` [PATCH 08/18] writeback: split inode_wb_list_lock into bdi_writeback.list_lock Wu Fengguang
2011-05-19 21:45 ` [PATCH 09/18] writeback: elevate queue_io() into wb_writeback() Wu Fengguang
2011-05-19 21:45 ` [PATCH 10/18] writeback: avoid extra sync work at enqueue time Wu Fengguang
2011-05-19 21:45 ` [PATCH 11/18] writeback: add bdi_dirty_limit() kernel-doc Wu Fengguang
2011-05-19 21:45 ` [PATCH 12/18] writeback: skip balance_dirty_pages() for in-memory fs Wu Fengguang
2011-05-19 21:45 ` [PATCH 13/18] writeback: remove writeback_control.more_io Wu Fengguang
2011-05-19 21:45 ` [PATCH 14/18] writeback: make writeback_control.nr_to_write straight Wu Fengguang
2011-05-19 22:06 ` Wu Fengguang
2011-05-19 23:29 ` Dave Chinner
2011-05-20 4:07 ` Wu Fengguang
2011-05-20 6:52 ` Dave Chinner
2011-05-20 7:15 ` Wu Fengguang
2011-05-20 7:26 ` Wu Fengguang
2011-05-19 21:45 ` Wu Fengguang [this message]
2011-05-19 21:45 ` [PATCH 16/18] writeback: trace event writeback_single_inode Wu Fengguang
2011-05-19 21:45 ` [PATCH 17/18] writeback: trace event writeback_queue_io Wu Fengguang
2011-05-19 21:45 ` [PATCH 18/18] writeback: rearrange the wb_writeback() loop Wu Fengguang
2011-05-23 9:07 ` [PATCH 00/18] writeback fixes and cleanups for 2.6.40 (v3) Christoph Hellwig
2011-05-23 9:28 ` Wu Fengguang
2011-05-24 3:28 ` Wu Fengguang
2011-06-01 22:31 ` Andrew Morton
2011-06-02 2:29 ` Wu Fengguang
2011-06-07 12:13 ` writeback merge status, was " Christoph Hellwig
2011-06-07 20:15 ` Andrew Morton
2011-06-07 21:11 ` Wu Fengguang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110519214746.165508083@intel.com \
--to=fengguang.wu@intel.com \
--cc=akpm@linux-foundation.org \
--cc=jack@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).