diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-25 11:39:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-25 11:39:07 -0400 |
| commit | 871eae4891a844e1fd065467b940f98dbf7aad1c (patch) | |
| tree | 30c0ea313fc55a3091a40893b77600b8f3daf63f /mm | |
| parent | 502adf5778f4151dcba3f64dd6ed322151f3712c (diff) | |
| parent | b5420f235953448eeae615b3361584dc5e414f34 (diff) | |
Merge branch '2.6.36-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev
* '2.6.36-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev:
xfs: do not discard page cache data on EAGAIN
xfs: don't do memory allocation under the CIL context lock
xfs: Reduce log force overhead for delayed logging
xfs: dummy transactions should not dirty VFS state
xfs: ensure f_ffree returned by statfs() is non-negative
xfs: handle negative wbc->nr_to_write during sync writeback
writeback: write_cache_pages doesn't terminate at nr_to_write <= 0
xfs: fix untrusted inode number lookup
xfs: ensure we mark all inodes in a freed cluster XFS_ISTALE
xfs: unlock items before allowing the CIL to commit
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/page-writeback.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index c09ef5219cbe..a803f5e33471 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c | |||
| @@ -985,22 +985,16 @@ continue_unlock: | |||
| 985 | } | 985 | } |
| 986 | } | 986 | } |
| 987 | 987 | ||
| 988 | if (wbc->nr_to_write > 0) { | 988 | /* |
| 989 | if (--wbc->nr_to_write == 0 && | 989 | * We stop writing back only if we are not doing |
| 990 | wbc->sync_mode == WB_SYNC_NONE) { | 990 | * integrity sync. In case of integrity sync we have to |
| 991 | /* | 991 | * keep going until we have written all the pages |
| 992 | * We stop writing back only if we are | 992 | * we tagged for writeback prior to entering this loop. |
| 993 | * not doing integrity sync. In case of | 993 | */ |
| 994 | * integrity sync we have to keep going | 994 | if (--wbc->nr_to_write <= 0 && |
| 995 | * because someone may be concurrently | 995 | wbc->sync_mode == WB_SYNC_NONE) { |
| 996 | * dirtying pages, and we might have | 996 | done = 1; |
| 997 | * synced a lot of newly appeared dirty | 997 | break; |
| 998 | * pages, but have not synced all of the | ||
| 999 | * old dirty pages. | ||
| 1000 | */ | ||
| 1001 | done = 1; | ||
| 1002 | break; | ||
| 1003 | } | ||
| 1004 | } | 998 | } |
| 1005 | } | 999 | } |
| 1006 | pagevec_release(&pvec); | 1000 | pagevec_release(&pvec); |