ocfs2: free the mle while the res had one, to avoid mle memory leak.
PATCH 1/1 ocfs2: free the mle while the res had one, to avoid mle memory leak.
In the function dlm_migrate_request_handler, while the ret is --EEXIST, the mle should be freed, otherwise the memory will be leaked.
dlm/dlmmaster.c 2016-09-13 15:27:05.014675736 +0800 renamed from dlm/dlmmaster.c 2016-09-13 15:18:13.602684325 +0800 +3 -0
@@ -3188,6 +3188,9 @@ int dlm_migrate_request_handler(struct o migrate->new_master, migrate->master); + if (ret < 0) + kmem_cache_free(dlm_mle_cache, mle); + spin_unlock(&dlm->master_lock); unlock: spin_unlock(&dlm->spinlock);
-------------------------------------------------------------------------------------------------------------------------------------
???????????????????????????????????????? ???????????????????????????????????????? ????????????????????????????????????????
???
This e-mail and its attachments contain confidential information from H3C, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this e-mail in error, please notify the sender by phone or email immediately and delete it!
PATCH 1/1 ocfs2: free the mle while the res had one, to avoid mle memory leak.
Hi,
Quoted 1 line · Guozhonghua
In the function
dlm_migrate_request_handler, while the ret is --EEXIST, the mle should be freed, otherwise the memory will be leaked.
Keep your commit comments within 75 or 78 (I don't remember clearly but git will warn if you don't keep its rule) characters per line.
Quoted 4 lines
Signed-off-by Guozhonghua <[email protected]>---
ocfs2.orig/dlm/dlmmaster.c2016-09-13 15:18:13.602684325 +0800
Please use git format-patch to create patch. FYI:
http://wiki.openhatch.org/How_to_generate_patches_with_git_format-patch
Sorry, I don't familiar with ocfs2/dlm code, so cannot review this patch.
Eric
Quoted 28 lines
+++
ocfs2/dlm/dlmmaster.c2016-09-13 15:27:05.014675736 +0800dlm/dlmmaster.c 2016-09-13 15:27:05.014675736 +0800 renamed from dlm/dlmmaster.c 2016-09-13 15:18:13.602684325 +0800 +3
-1@@ -3188,6 +3188,9 @@ int dlm_migrate_request_handler(struct o migrate->new_master, migrate->master); + if (ret < 0) + kmem_cache_free(dlm_mle_cache, mle); + spin_unlock(&dlm->master_lock); unlock: spin_unlock(&dlm->spinlock); -------------------------------------------------------------------------------------------------------------------------------------???????????????????????????????????????? ???????????????????????????????????????? ????????????????????????????????????????
???
This e-mail and its attachments contain confidential information from H3C, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this e-mail in error, please notify the sender by phone or email immediately and delete it!
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel at oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
PATCH 1/1 ocfs2: free the mle while the res had one, to avoid mle memory leak.
In reply to GuozhonghuaQuoted 7 lines · On Tue, 13 Sep 2016 07:52:30 +0000 Guozhonghua <[email protected]> wrote:
In the function
dlm_migrate_request_handler, while the ret is --EEXIST, the mle should be freed, otherwise the memory will be leaked.Signed-off-by Guozhonghua <[email protected]>
dlm/dlmmaster.c 2016-09-13 15:27:05.014675736 +0800 int dlm_migrate_request_handler(struct o · line 3196
Quoted 9 lines
dlm/dlmmaster.c 2016-09-13 15:27:05.014675736 +0800 renamed from dlm/dlmmaster.c 2016-09-13 15:18:13.602684325 +0800 +3
-0@@ -3188,6 +3188,9 @@ int dlm_migrate_request_handler(struct o migrate->new_master, migrate->master); + if (ret < 0) + kmem_cache_free(dlm_mle_cache, mle); + spin_unlock(&dlm->master_lock); unlock: spin_unlock(&dlm->spinlock);
Looks OK to me.
I wonder if there's another bug here. If dlm_add_migration_mle() failed, is it correct to go ahead and detach `oldmle'?
PATCH 1/1 ocfs2: free the mle while the res had one, to avoid mle memory leak.
Hi Andrew,-EEXIST can only happen in case of "I am the master". So dlm_migrate_request_handler won't get this return value.
I think commit 32e493265b2b ("ocfs2/dlm: do not insert a new mle when another process is already migrating") has already considered the case.
So NAK.
Thanks,
Joseph
Quoted 31 lines · Andrew Morton
Quoted 7 lines · On Tue, 13 Sep 2016 07:52:30 +0000 Guozhonghua <[email protected]> wrote:
In the function
dlm_migrate_request_handler, while the ret is --EEXIST, the mle should be freed, otherwise the memory will be leaked.Signed-off-by Guozhonghua <[email protected]>dlm/dlmmaster.c 2016-09-13 15:27:05.014675736 +0800 int dlm_migrate_request_handler(struct o · line 3196
Quoted 9 lines
dlm/dlmmaster.c 2016-09-13 15:27:05.014675736 +0800 renamed from dlm/dlmmaster.c 2016-09-13 15:18:13.602684325 +0800 +3
-0@@ -3188,6 +3188,9 @@ int dlm_migrate_request_handler(struct o migrate->new_master, migrate->master); + if (ret < 0) + kmem_cache_free(dlm_mle_cache, mle); + spin_unlock(&dlm->master_lock); unlock: spin_unlock(&dlm->spinlock);Looks OK to me.
I wonder if there's another bug here. If
dlm_add_migration_mle()failed, is it correct to go ahead and detach `oldmle'?_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel at oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel