diff options
author | Wu Fengguang <fengguang.wu@intel.com> | 2011-05-05 23:10:38 -0400 |
---|---|---|
committer | Wu Fengguang <fengguang.wu@intel.com> | 2011-06-07 20:25:23 -0400 |
commit | 846d5a091b0506b75489577cde27f39b37a192a4 (patch) | |
tree | 739bd1e28f86d4620b55401d0cc4b5ab4e44eb91 /fs | |
parent | b7a2441f9966fe3e1be960a876ab52e6029ea005 (diff) |
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: Jan Kara <jack@suse.cz>
Proposed-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/write.c | 3 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_aops.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index e268e3b23497..dd6a6cee39a7 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -1564,8 +1564,7 @@ int nfs_write_inode(struct inode *inode, struct writeback_control *wbc) | |||
1564 | int status; | 1564 | int status; |
1565 | bool sync = true; | 1565 | bool sync = true; |
1566 | 1566 | ||
1567 | if (wbc->sync_mode == WB_SYNC_NONE || wbc->nonblocking || | 1567 | if (wbc->sync_mode == WB_SYNC_NONE) |
1568 | wbc->for_background) | ||
1569 | sync = false; | 1568 | sync = false; |
1570 | 1569 | ||
1571 | status = pnfs_layoutcommit_inode(inode, sync); | 1570 | status = pnfs_layoutcommit_inode(inode, sync); |
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index 79ce38be15a1..7559861481aa 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c | |||
@@ -970,7 +970,7 @@ xfs_vm_writepage( | |||
970 | offset = page_offset(page); | 970 | offset = page_offset(page); |
971 | type = IO_OVERWRITE; | 971 | type = IO_OVERWRITE; |
972 | 972 | ||
973 | if (wbc->sync_mode == WB_SYNC_NONE && wbc->nonblocking) | 973 | if (wbc->sync_mode == WB_SYNC_NONE) |
974 | nonblocking = 1; | 974 | nonblocking = 1; |
975 | 975 | ||
976 | do { | 976 | do { |