Subject: [folded-merged] writeback-do-not-sync-data-dirtied-after-sync-start-fix.patch removed from -mm tree
To: jack@xxxxxxx,dchinner@xxxxxxxxxx,fengguang.wu@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 12 Nov 2013 14:35:41 -0800
The patch titled
Subject: writeback: use older_than_this_is_set instead of magic older_than_this == 0
has been removed from the -mm tree. Its filename was
writeback-do-not-sync-data-dirtied-after-sync-start-fix.patch
This patch was dropped because it was folded into writeback-do-not-sync-data-dirtied-after-sync-start.patch
------------------------------------------------------
From: Jan Kara <jack@xxxxxxx>
Subject: writeback: use older_than_this_is_set instead of magic older_than_this == 0
Currently we use 0 as a special value of work->older_than_this to
indicate that wb_writeback() should set work->older_that_this to current
time. This works but it is a bit magic. So use a special flag in
work_struct for that.
Also fixup writeback from workqueue rescuer to include all inodes.
Signed-off-by: Jan Kara <jack@xxxxxxx>
Cc: Fengguang Wu <fengguang.wu@xxxxxxxxx>
Cc: Dave Chinner <dchinner@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/fs-writeback.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff -puN fs/fs-writeback.c~writeback-do-not-sync-data-dirtied-after-sync-start-fix fs/fs-writeback.c
--- a/fs/fs-writeback.c~writeback-do-not-sync-data-dirtied-after-sync-start-fix
+++ a/fs/fs-writeback.c
@@ -39,6 +39,10 @@
struct wb_writeback_work {
long nr_pages;
struct super_block *sb;
+ /*
+ * Write only inodes dirtied before this time. Don't forget to set
+ * older_than_this_is_set when you set this.
+ */
unsigned long older_than_this;
enum writeback_sync_modes sync_mode;
unsigned int tagged_writepages:1;
@@ -46,6 +50,7 @@ struct wb_writeback_work {
unsigned int range_cyclic:1;
unsigned int for_background:1;
unsigned int for_sync:1; /* sync(2) WB_SYNC_ALL writeback */
+ unsigned int older_than_this_is_set:1;
enum wb_reason reason; /* why was writeback initiated? */
struct list_head list; /* pending work list */
@@ -732,6 +737,8 @@ static long writeback_inodes_wb(struct b
.sync_mode = WB_SYNC_NONE,
.range_cyclic = 1,
.reason = reason,
+ .older_than_this = jiffies,
+ .older_than_this_is_set = 1,
};
spin_lock(&wb->list_lock);
@@ -793,7 +800,7 @@ static long wb_writeback(struct bdi_writ
struct inode *inode;
long progress;
- if (!work->older_than_this)
+ if (!work->older_than_this_is_set)
work->older_than_this = jiffies;
spin_lock(&wb->list_lock);
@@ -1356,6 +1363,7 @@ void sync_inodes_sb(struct super_block *
.sync_mode = WB_SYNC_ALL,
.nr_pages = LONG_MAX,
.older_than_this = older_than_this,
+ .older_than_this_is_set = 1,
.range_cyclic = 0,
.done = &done,
.reason = WB_REASON_SYNC,
_
Patches currently in -mm which might be from jack@xxxxxxx are
origin.patch
ocfs2-dont-spam-on-edquot.patch
ocfs2-simplify-ocfs2_invalidatepage-and-ocfs2_releasepage.patch
writeback-do-not-sync-data-dirtied-after-sync-start.patch
writeback-do-not-sync-data-dirtied-after-sync-start-fix-2.patch
writeback-do-not-sync-data-dirtied-after-sync-start-fix-3.patch
rbtree-fix-rbtree_postorder_for_each_entry_safe-iterator.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
