History

Merge branch 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux

* 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux: writeback: remove vm_dirties and task->dirties writeback: hard throttle 1000+ dd on a slow USB stick mm: Make task in balance_dirty_pages() killable

Linus Torvalds committed 14 years ago

Commit 8ba8ed52 parents bbbc479 468e6a24 files · +7 −23Browse files

Showing the changes to include/linux (2 of 4 files). Show all

Unified · Split

2 files
  1. include/linux/init_task.h +0 −1
  2. include/linux/sched.h +0 −1
include/linux/init_task.h+0−1
@@ -184,7 +184,6 @@ extern struct cred init_cred; · 183 unmodified lines
184 [PIDTYPE_SID] = INIT_PID_LINK(PIDTYPE_SID), \184 [PIDTYPE_SID] = INIT_PID_LINK(PIDTYPE_SID), \
185 }, \185 }, \
186 .thread_group = LIST_HEAD_INIT(tsk.thread_group), \186 .thread_group = LIST_HEAD_INIT(tsk.thread_group), \
187 .dirties = INIT_PROP_LOCAL_SINGLE(dirties), \
188 INIT_IDS \187 INIT_IDS \
189 INIT_PERF_EVENTS(tsk) \188 INIT_PERF_EVENTS(tsk) \
190 INIT_TRACE_IRQFLAGS \189 INIT_TRACE_IRQFLAGS \
include/linux/sched.h+0−1
@@ -1521,7 +1521,6 @@ struct task_struct { · 1520 unmodified lines
1521#ifdef CONFIG_FAULT_INJECTION1521#ifdef CONFIG_FAULT_INJECTION
1522 int make_it_fail;1522 int make_it_fail;
1523#endif1523#endif
1524 struct prop_local_single dirties;
1525 /*1524 /*
1526 * when (nr_dirtied >= nr_dirtied_pause), it's time to call1525 * when (nr_dirtied >= nr_dirtied_pause), it's time to call
1527 * balance_dirty_pages() for some dirty throttling pause1526 * balance_dirty_pages() for some dirty throttling pause

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t