diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /include/linux/writeback.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'include/linux/writeback.h')
| -rw-r--r-- | include/linux/writeback.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 66ebddcff664..705f01fe413a 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h | |||
| @@ -49,6 +49,7 @@ struct writeback_control { | |||
| 49 | unsigned nonblocking:1; /* Don't get stuck on request queues */ | 49 | unsigned nonblocking:1; /* Don't get stuck on request queues */ |
| 50 | unsigned encountered_congestion:1; /* An output: a queue is full */ | 50 | unsigned encountered_congestion:1; /* An output: a queue is full */ |
| 51 | unsigned for_kupdate:1; /* A kupdate writeback */ | 51 | unsigned for_kupdate:1; /* A kupdate writeback */ |
| 52 | unsigned for_background:1; /* A background writeback */ | ||
| 52 | unsigned for_reclaim:1; /* Invoked from the page allocator */ | 53 | unsigned for_reclaim:1; /* Invoked from the page allocator */ |
| 53 | unsigned range_cyclic:1; /* range_start is cyclic */ | 54 | unsigned range_cyclic:1; /* range_start is cyclic */ |
| 54 | unsigned more_io:1; /* more io to be dispatched */ | 55 | unsigned more_io:1; /* more io to be dispatched */ |