From 09447d50265509c84f74210fd7cd0922ab861f4f Mon Sep 17 00:00:00 2001 From: Wu Fengguang Date: Thu, 3 Dec 2009 13:54:25 +0100 Subject: [PATCH] --- yaml --- r: 172983 b: refs/heads/master c: b17621fed6aa039387e35f9b4d34d98f213e5673 h: refs/heads/master i: 172981: da509fab35cd877b163909d5d1daf1829757ff88 172979: b524846e18dbeef1bd36e47eb2921b5f18b5a2e3 172975: a5c785b939c0372a4928a6d14b7d506e8c50d362 v: v3 --- [refs] | 2 +- trunk/fs/fs-writeback.c | 1 + trunk/fs/nfs/write.c | 2 +- trunk/include/linux/writeback.h | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a00cdf118e6c..825f0f60a7e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 951c30d135390a108f102b0f6e3cfa6241f2a1aa +refs/heads/master: b17621fed6aa039387e35f9b4d34d98f213e5673 diff --git a/trunk/fs/fs-writeback.c b/trunk/fs/fs-writeback.c index 0306c8e7d6b5..0793961f7699 100644 --- a/trunk/fs/fs-writeback.c +++ b/trunk/fs/fs-writeback.c @@ -738,6 +738,7 @@ static long wb_writeback(struct bdi_writeback *wb, .sync_mode = args->sync_mode, .older_than_this = NULL, .for_kupdate = args->for_kupdate, + .for_background = args->for_background, .range_cyclic = args->range_cyclic, }; unsigned long oldest_jif; diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c index 53eb26c16b50..c84b5cc1a943 100644 --- a/trunk/fs/nfs/write.c +++ b/trunk/fs/nfs/write.c @@ -178,7 +178,7 @@ static int wb_priority(struct writeback_control *wbc) { if (wbc->for_reclaim) return FLUSH_HIGHPRI | FLUSH_STABLE; - if (wbc->for_kupdate) + if (wbc->for_kupdate || wbc->for_background) return FLUSH_LOWPRI; return 0; } diff --git a/trunk/include/linux/writeback.h b/trunk/include/linux/writeback.h index 66ebddcff664..705f01fe413a 100644 --- a/trunk/include/linux/writeback.h +++ b/trunk/include/linux/writeback.h @@ -49,6 +49,7 @@ struct writeback_control { 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 for_reclaim:1; /* Invoked from the page allocator */ unsigned range_cyclic:1; /* range_start is cyclic */ unsigned more_io:1; /* more io to be dispatched */