write-back: fix nr_to_write counter
Subsystems (3)
PATCH 1/1 write-back: fix nr_to_write counter
From: Artem Bityutskiy <[email protected]>
Date: Mon, 2 Feb 2009 18:33:49 +0200
Subject: [PATCH] write-back: fix nr_to_write counter
Commit 05fe478dd04e02fa230c305ab9b5616669821dd3 introduced some @wbc->nr_to_write breakage. Here is the change from the commit:
mm/page-writeback.c +4 -2
@@ -963,8 +963,10 @@ retry: } } -if (--nr_to_write <=0 ) - done =1 ; +if (wbc->sync_mode ==WB_SYNC_NONE ) { +if (--wbc->nr_to_write <=0 ) + done =1 ; + }if (wbc->nonblocking &&bdi_write_congested (bdi)) { wbc->encountered_congestion =1 ; done =1
}
It makes the following changes:
1. Decrement wbc->nr_to_write instead of nr_to_write
2. Decrement wbc->nr_to_write _only_ if wbc->sync_mode == WB_SYNC_NONE
3. If synced nr_to_write pages, stop only if if wbc->sync_mode == WB_SYNC_NONE, otherwise keep going.
However, according to the commit message, the intention was to only make change 3. Change 1 is a bug. Change 2 does not seem to be necessary, and it breaks UBIFS expectations, so if needed, it should be done separately later. And change 2 does not seem to be documented in the commit message.
This patch des the following:
1. Undo changes 1 and 2
2. Add a comment explaining change 3 (it very useful to have comments in _code_, not only in the commit).
--- mm/page-writeback.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)
mm/page-writeback.c +15 -6
@@ -1051,13 +1051,22 @@ continue_unlock: } } -if (wbc->sync_mode ==WB_SYNC_NONE ) { - wbc->nr_to_write--; -if (wbc->nr_to_write <=0 ) { - done =1 ; -break ; - } +if (nr_to_write >0 ) + nr_to_write--; +else if (wbc->sync_mode ==WB_SYNC_NONE ) { +/* +* We stop writing back only if we are not +* doing integrity sync. In case of integrity +* sync we have to keep going because someone +* may be concurrently dirtying pages, and we +* might have synced a lot of newly appeared +* dirty pages, bud have not synced all of the +* old dirty pages. +*/ + done =1 ; +break ; } +if (wbc->nonblocking &&bdi_write_congested (bdi)) { wbc->encountered_congestion =1 ; done =1 ;
Signature · 11 lines
1.6.0.6 -- Best regards, Artem Bityutskiy (Битюцкий Артём) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 22 lines · Artem Bityutskiy
From: Artem Bityutskiy <[email protected]>
Date: Mon, 2 Feb 2009 18:33:49 +0200
Subject: [PATCH] write-back: fixnr_to_writecounterCommit
05fe478dd04e02fa230c305ab9b5616669821dd3introduced some @wbc->nr_to_write breakage. Here is the change from the commit:mm/page-writeback.c +4
-2@@ -963,8 +963,10 @@ retry: } } -if (--nr_to_write <=0 ) - done =1 ; +if (wbc->sync_mode ==WB_SYNC_NONE ) { +if (--wbc->nr_to_write <=0 ) + done =1 ; + }if (wbc->nonblocking &&bdi_write_congested (bdi)) { wbc->encountered_congestion =1 ; done =1
Quoted 1 line
}
Actually quoting a patch in the description in this manner will make the patch fail to apply (or fail to apply correctly). If you must quote the patch, you should probably prepend ">" or something.
Quoted 61 lines
It makes the following changes:
1. Decrementwbc->nr_to_writeinstead ofnr_to_write
2. Decrementwbc->nr_to_write_only_ ifwbc->sync_mode==WB_SYNC_NONE
3. If syncednr_to_writepages, stop only if ifwbc->sync_mode==WB_SYNC_NONE, otherwise keep going.However, according to the commit message, the intention was to only make change 3. Change 1 is a bug. Change 2 does not seem to be necessary, and it breaks UBIFS expectations, so if needed, it should be done separately later. And change 2 does not seem to be documented in the commit message.
This patch des the following:
1. Undo changes 1 and 2
2. Add a comment explaining change 3 (it very useful to have comments in _code_, not only in the commit).Signed-off-by Artem Bityutskiy <[email protected]>Acked-by Nick Piggin <[email protected]>Cc Andrew Morton <[email protected]>--- mm/page-writeback.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)mm/page-writeback.c +15
-6@@ -1051,13 +1051,22 @@ continue_unlock: } } -if (wbc->sync_mode ==WB_SYNC_NONE ) { - wbc->nr_to_write--; -if (wbc->nr_to_write <=0 ) { - done =1 ; -break ; - } +if (nr_to_write >0 ) + nr_to_write--; +else if (wbc->sync_mode ==WB_SYNC_NONE ) { +/* +* We stop writing back only if we are not +* doing integrity sync. In case of integrity +* sync we have to keep going because someone +* may be concurrently dirtying pages, and we +* might have synced a lot of newly appeared +* dirty pages, bud have not synced all of the +* old dirty pages. +*/ + done =1 ; +break ; } +if (wbc->nonblocking &&bdi_write_congested (bdi)) { wbc->encountered_congestion =1 ; done =1 ;Signature · 1 line
1.6.0.6
Signature · 2 lines
David Kleikamp IBM Linux Technology Center
Artem Bityutskiy
Acked-by Nick Piggin[Take into account Dave Kleikamp's suggestion and fix commit message]
From: Artem Bityutskiy <[email protected]>
Date: Mon, 2 Feb 2009 18:33:49 +0200
Subject: [PATCH] write-back: fix nr_to_write counter
Commit 05fe478dd04e02fa230c305ab9b5616669821dd3 introduced some @wbc->nr_to_write breakage. Here is the change from the commit:
Quoted 6 lines
mm/page-writeback.c +0
-0@@ -963,8 +963,10 @@ retry: } }
mm/page-writeback.c retry:
Quoted 10 lines
mm/page-writeback.c +0
-0if (--nr_to_write <=0 ) done =1 ;if (wbc->sync_mode ==WB_SYNC_NONE ) {if (--wbc->nr_to_write <=0 ) done =1 ; }if (wbc->nonblocking &&bdi_write_congested (bdi)) { wbc->encountered_congestion =1 ; done = 1 }
It makes the following changes:
1. Decrement wbc->nr_to_write instead of nr_to_write
2. Decrement wbc->nr_to_write _only_ if wbc->sync_mode == WB_SYNC_NONE
3. If synced nr_to_write pages, stop only if if wbc->sync_mode == WB_SYNC_NONE, otherwise keep going.
However, according to the commit message, the intention was to only make change 3. Change 1 is a bug. Change 2 does not seem to be necessary, and it breaks UBIFS expectations, so if needed, it should be done separately later. And change 2 does not seem to be documented in the commit message.
This patch does the following:
1. Undo changes 1 and 2
2. Add a comment explaining change 3 (it very useful to have comments in _code_, not only in the commit).
--- mm/page-writeback.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)
mm/page-writeback.c +15 -6
@@ -1051,13 +1051,22 @@ continue_unlock: } } -if (wbc->sync_mode ==WB_SYNC_NONE ) { - wbc->nr_to_write--; -if (wbc->nr_to_write <=0 ) { - done =1 ; -break ; - } +if (nr_to_write >0 ) + nr_to_write--; +else if (wbc->sync_mode ==WB_SYNC_NONE ) { +/* +* We stop writing back only if we are not +* doing integrity sync. In case of integrity +* sync we have to keep going because someone +* may be concurrently dirtying pages, and we +* might have synced a lot of newly appeared +* dirty pages, bud have not synced all of the +* old dirty pages. +*/ + done =1 ; +break ; } +if (wbc->nonblocking &&bdi_write_congested (bdi)) { wbc->encountered_congestion =1 ; done =1 ;
Signature · 11 lines
1.6.0.6 -- Best regards, Artem Bityutskiy (Битюцкий Артём) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 write-back: fix nr_to_write counter
[Fix spelling, pointed to by jim owens]
From: Artem Bityutskiy <[email protected]>
Date: Mon, 2 Feb 2009 18:33:49 +0200
Subject: [PATCH] write-back: fix nr_to_write counter
Commit 05fe478dd04e02fa230c305ab9b5616669821dd3 introduced some @wbc->nr_to_write breakage. Here is the change from the commit:
Quoted 6 lines
mm/page-writeback.c +0
-0@@ -963,8 +963,10 @@ retry: } }
mm/page-writeback.c retry:
Quoted 10 lines
mm/page-writeback.c +0
-0if (--nr_to_write <=0 ) done =1 ;if (wbc->sync_mode ==WB_SYNC_NONE ) {if (--wbc->nr_to_write <=0 ) done =1 ; }if (wbc->nonblocking &&bdi_write_congested (bdi)) { wbc->encountered_congestion =1 ; done = 1 }
It makes the following changes:
1. Decrement wbc->nr_to_write instead of nr_to_write
2. Decrement wbc->nr_to_write _only_ if wbc->sync_mode == WB_SYNC_NONE
3. If synced nr_to_write pages, stop only if if wbc->sync_mode == WB_SYNC_NONE, otherwise keep going.
However, according to the commit message, the intention was to only make change 3. Change 1 is a bug. Change 2 does not seem to be necessary, and it breaks UBIFS expectations, so if needed, it should be done separately later. And change 2 does not seem to be documented in the commit message.
This patch does the following:
1. Undo changes 1 and 2
2. Add a comment explaining change 3 (it very useful to have comments in _code_, not only in the commit).
--- mm/page-writeback.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)
mm/page-writeback.c +15 -6
@@ -1051,13 +1051,22 @@ continue_unlock: } } -if (wbc->sync_mode ==WB_SYNC_NONE ) { - wbc->nr_to_write--; -if (wbc->nr_to_write <=0 ) { - done =1 ; -break ; - } +if (nr_to_write >0 ) + nr_to_write--; +else if (wbc->sync_mode ==WB_SYNC_NONE ) { +/* +* We stop writing back only if we are not +* doing integrity sync. In case of integrity +* sync we have to keep going because someone +* may be concurrently dirtying pages, and we +* might have synced a lot of newly appeared +* dirty pages, but have not synced all of the +* old dirty pages. +*/ + done =1 ; +break ; } +if (wbc->nonblocking &&bdi_write_congested (bdi)) { wbc->encountered_congestion =1 ; done =1 ;
Signature · 5 lines
1.6.0.6 -- Best regards, Artem Bityutskiy (Битюцкий Артём)