Subject: + list_lru-dynamically-adjust-node-arrays-super-fix-for-destroy-lrus.patch added to -mm tree
To: glommer@xxxxxxxxx,dchinner@xxxxxxxxxx,glommer@xxxxxxxxxx,mhocko@xxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 26 Jun 2013 13:35:04 -0700
The patch titled
Subject: super: fix for destroy lrus
has been added to the -mm tree. Its filename is
list_lru-dynamically-adjust-node-arrays-super-fix-for-destroy-lrus.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Glauber Costa <glommer@xxxxxxxxx>
Subject: super: fix for destroy lrus
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@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxx>
Cc: Dave Chinner <dchinner@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/super.c | 3 +++
fs/xfs/xfs_buf.c | 2 +-
fs/xfs/xfs_qm.c | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff -puN fs/super.c~list_lru-dynamically-adjust-node-arrays-super-fix-for-destroy-lrus fs/super.c
--- a/fs/super.c~list_lru-dynamically-adjust-node-arrays-super-fix-for-destroy-lrus
+++ a/fs/super.c
@@ -328,6 +328,9 @@ void deactivate_locked_super(struct supe
/* 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);
} else {
diff -puN fs/xfs/xfs_buf.c~list_lru-dynamically-adjust-node-arrays-super-fix-for-destroy-lrus fs/xfs/xfs_buf.c
--- a/fs/xfs/xfs_buf.c~list_lru-dynamically-adjust-node-arrays-super-fix-for-destroy-lrus
+++ a/fs/xfs/xfs_buf.c
@@ -1591,8 +1591,8 @@ xfs_free_buftarg(
struct xfs_mount *mp,
struct xfs_buftarg *btp)
{
- list_lru_destroy(&btp->bt_lru);
unregister_shrinker(&btp->bt_shrinker);
+ list_lru_destroy(&btp->bt_lru);
if (mp->m_flags & XFS_MOUNT_BARRIER)
xfs_blkdev_issue_flush(btp);
diff -puN fs/xfs/xfs_qm.c~list_lru-dynamically-adjust-node-arrays-super-fix-for-destroy-lrus fs/xfs/xfs_qm.c
--- a/fs/xfs/xfs_qm.c~list_lru-dynamically-adjust-node-arrays-super-fix-for-destroy-lrus
+++ a/fs/xfs/xfs_qm.c
@@ -889,8 +889,8 @@ xfs_qm_destroy_quotainfo(
qi = mp->m_quotainfo;
ASSERT(qi != NULL);
- list_lru_destroy(&qi->qi_lru);
unregister_shrinker(&qi->qi_shrinker);
+ list_lru_destroy(&qi->qi_lru);
if (qi->qi_uquotaip) {
IRELE(qi->qi_uquotaip);
_
Patches currently in -mm which might be from glommer@xxxxxxxxx are
linux-next.patch
inode-convert-inode-lru-list-to-generic-lru-list-code-inode-move-inode-to-a-different-list-inside-lock.patch
list_lru-remove-special-case-function-list_lru_dispose_all.patch
list_lru-dynamically-adjust-node-arrays-super-fix-for-destroy-lrus.patch
memcg-also-test-for-skip-accounting-at-the-page-allocation-level.patch
memcg-do-not-account-memory-used-for-cache-creation.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
