Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from Andrew Morton: "12 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm, vmscan: prevent kswapd livelock due to pfmemalloc-throttled process being killed memcg: fix destination cgroup leak on task charges migration mm: memcontrol: switch soft limit default back to infinity mm/debug_pagealloc: remove obsolete Kconfig options vfs: renumber FMODE_NONOTIFY and add to uniqueness check arch/blackfin/mach-bf533/boards/stamp.c: add linux/delay.h ocfs2: fix the wrong directory passed to ocfs2_lookup_ino_from_name() when link file MAINTAINERS: update rydberg's addresses mm: protect set_page_dirty() from ongoing truncation mm: prevent endless growth of anon_vma hierarchy exit: fix race between wait_consider_task() and wait_task_zombie() ocfs2: remove bogus check in dlm_process_recovery_data

Linus Torvalds committed 11 years ago

Commit b3d574a2 parents 11c8f01 9e5e36617 files · +155 −101Browse files

Showing the changes to include/linux (3 of 17 files). Show all

Unified · Split

3 files

include/linux/fs.h +1 −1
include/linux/rmap.h +10 −0
include/linux/writeback.h +0 −1

include/linux/fs.h+1−1

@@ -135,7 +135,7 @@ typedef void (dio_iodone_t)(struct kiocb *iocb, loff_t offset, · 134 unmodified lines
135	#define FMODE_CAN_WRITE ((__force fmode_t)0x40000)	135	#define FMODE_CAN_WRITE ((__force fmode_t)0x40000)
136		136
137	/* File was opened by fanotify and shouldn't generate fanotify events */	137	/* File was opened by fanotify and shouldn't generate fanotify events */
138	#define FMODE_NONOTIFY ((__force fmode_t)0x1000000)	138	#define FMODE_NONOTIFY ((__force fmode_t)0x4000000)
139		139
140	/*	140	/*
141	* Flag for rw_copy_check_uvector and compat_rw_copy_check_uvector	141	* Flag for rw_copy_check_uvector and compat_rw_copy_check_uvector

include/linux/rmap.h+10−0

@@ -36,6 +36,16 @@ struct anon_vma { · 35 unmodified lines
36	*/	36	*/
37	atomic_t refcount;	37	atomic_t refcount;
38		38
		39	/*
		40	* Count of child anon_vmas and VMAs which points to this anon_vma.
		41	*
		42	* This counter is used for making decision about reusing anon_vma
		43	* instead of forking new one. See comments in function anon_vma_clone.
		44	*/
		45	unsigned degree;
		46
		47	struct anon_vma parent; / Parent of this anon_vma */
		48
39	/*	49	/*
40	* NOTE: the LSB of the rb_root.rb_node is set by	50	* NOTE: the LSB of the rb_root.rb_node is set by
41	* mm_take_all_locks() _after_ taking the above lock. So the	51	* mm_take_all_locks() _after_ taking the above lock. So the

include/linux/writeback.h+0−1

@@ -177,7 +177,6 @@ int write_cache_pages(struct address_space *mapping, · 176 unmodified lines
177	struct writeback_control *wbc, writepage_t writepage,	177	struct writeback_control *wbc, writepage_t writepage,
178	void *data);	178	void *data);
179	int do_writepages(struct address_space mapping, struct writeback_control wbc);	179	int do_writepages(struct address_space mapping, struct writeback_control wbc);
180	void set_page_dirty_balance(struct page *page);
181	void writeback_set_ratelimit(void);	180	void writeback_set_ratelimit(void);
182	void tag_pages_for_writeback(struct address_space *mapping,	181	void tag_pages_for_writeback(struct address_space *mapping,
183	pgoff_t start, pgoff_t end);	182	pgoff_t start, pgoff_t end);