Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e422fd2c authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Linus Torvalds
Browse files

[PATCH] avoid -ENOMEM due reclaimable slab caches 



This makes sure that reclaimable buffer headers and reclaimable inodes
are accounted properly during the overcommit checks.

Signed-off-by: default avatarAndrea Arcangeli <andrea@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f48d9663

fs/buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -3115,7 +3115,7 @@ void __init buffer_init(void) 


	bh_cachep = kmem_cache_create("buffer_head",

			sizeof(struct buffer_head), 0,

			SLAB_PANIC, init_buffer_head, NULL);

			SLAB_RECLAIM_ACCOUNT|SLAB_PANIC, init_buffer_head, NULL);



	/*

	 * Limit the bh occupancy to 10% of ZONE_NORMAL

fs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1336,7 +1336,7 @@ void __init inode_init(unsigned long mempages) 


	/* inode slab cache */

	inode_cachep = kmem_cache_create("inode_cache", sizeof(struct inode),

				0, SLAB_PANIC, init_once, NULL);

				0, SLAB_RECLAIM_ACCOUNT|SLAB_PANIC, init_once, NULL);

	set_shrinker(DEFAULT_SEEKS, shrink_icache_memory);



	/* Hash may have been set up in inode_init_early */