Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

super: fix for destroy lrus

Browse Source 
This patch adds the missing call to list_lru_destroy (spotted by Li Zhong)
and moves the deletion to after the shrinker is unregistered, as correctly
spotted by Dave

Signed-off-by: Glauber Costa <glommer@openvz.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Glauber Costa 2013-08-28 10:18:18 +10:00 committed by Al Viro
parent 5ca302c8e5
commit f5e1dd3456
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/super.c
View File

@ -323,6 +323,9 @@ void deactivate_locked_super(struct super_block *s)
/* caches are now gone, we can safely kill the shrinker now */ /* caches are now gone, we can safely kill the shrinker now */
unregister_shrinker(&s->s_shrink); unregister_shrinker(&s->s_shrink);
list_lru_destroy(&s->s_dentry_lru);
list_lru_destroy(&s->s_inode_lru);
put_filesystem(fs); put_filesystem(fs);
put_super(s); put_super(s);
} else { } else {

2
fs/xfs/xfs_buf.c
View File

@ -1592,8 +1592,8 @@ xfs_free_buftarg(
struct xfs_mount *mp, struct xfs_mount *mp,
struct xfs_buftarg *btp) struct xfs_buftarg *btp)
{ {
list_lru_destroy(&btp->bt_lru);
unregister_shrinker(&btp->bt_shrinker); unregister_shrinker(&btp->bt_shrinker);
list_lru_destroy(&btp->bt_lru);
if (mp->m_flags & XFS_MOUNT_BARRIER) if (mp->m_flags & XFS_MOUNT_BARRIER)
xfs_blkdev_issue_flush(btp); xfs_blkdev_issue_flush(btp);

2
fs/xfs/xfs_qm.c
View File

@ -940,8 +940,8 @@ xfs_qm_destroy_quotainfo(
qi = mp->m_quotainfo; qi = mp->m_quotainfo;
ASSERT(qi != NULL); ASSERT(qi != NULL);
list_lru_destroy(&qi->qi_lru);
unregister_shrinker(&qi->qi_shrinker); unregister_shrinker(&qi->qi_shrinker);
list_lru_destroy(&qi->qi_lru);
if (qi->qi_uquotaip) { if (qi->qi_uquotaip) {
IRELE(qi->qi_uquotaip); IRELE(qi->qi_uquotaip);