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

Commit 517bf8fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull vfs lru leak fix from Al Viro:
 "The fix in "super: fix for destroy lrus" didn't - they need to be
  destroyed, all right, but that's the wrong place..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs/super.c: fix lru_list leak for real
parents 77c4ad8e c2d22ecd

fs/super.c

+2 −2
Original line number Diff line number Diff line
@@ -264,6 +264,8 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags) 
 */

static inline void destroy_super(struct super_block *s)

{

	list_lru_destroy(&s->s_dentry_lru);

	list_lru_destroy(&s->s_inode_lru);

#ifdef CONFIG_SMP

	free_percpu(s->s_files);

#endif
@@ -323,8 +325,6 @@ void deactivate_locked_super(struct super_block *s) 


		/* caches are now gone, we can safely kill the shrinker now */

		unregister_shrinker(&s->s_shrink);

		list_lru_destroy(&s->s_dentry_lru);

		list_lru_destroy(&s->s_inode_lru);



		put_filesystem(fs);

		put_super(s);