Skip to contentSkip to conversation

nfsd: Fix memleak.

PATCH In review majianpeng 3 participants 4 messages Jan 29, 2013 – Feb 5, 2013

Subsystems (2)
NFS client NFS server
lore
Share & tools
lore

majianpeng

author
#0 lore raw

PATCH 2/2 nfsd: Fix memleak.

V2hlbiBmcmVlIG5mcy1jbGllbnQsIGl0IG11c3QgZnJlZSB0aGUgLT5jbF9zdGF0ZWlkcy4NCg0K U2lnbmVkLW9mZi1ieTogSmlhbnBlbmcgTWEgPG1hamlhbnBlbmdAZ21haWwuY29tPg0KLS0tDQog ZnMvbmZzZC9uZnM0c3RhdGUuYyB8ICAgIDIgKysNCiAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRp b25zKCspDQoNCmRpZmYgLS1naXQgYS9mcy9uZnNkL25mczRzdGF0ZS5jIGIvZnMvbmZzZC9uZnM0 c3RhdGUuYw0KaW5kZXggYWM4ZWQ5Ni4uYTgzMDljNiAxMDA2NDQNCi0tLSBhL2ZzL25mc2QvbmZz NHN0YXRlLmMNCisrKyBiL2ZzL25mc2QvbmZzNHN0YXRlLmMNCkBAIC0xMDYwLDYgKzEwNjAsOCBA QCBmcmVlX2NsaWVudChzdHJ1Y3QgbmZzNF9jbGllbnQgKmNscCkNCiAJfQ0KIAlmcmVlX3N2Y19j cmVkKCZjbHAtPmNsX2NyZWQpOw0KIAlrZnJlZShjbHAtPmNsX25hbWUuZGF0YSk7DQorCWlkcl9y ZW1vdmVfYWxsKCZjbHAtPmNsX3N0YXRlaWRzKTsNCisJaWRyX2Rlc3Ryb3koJmNscC0+Y2xfc3Rh dGVpZHMpOw0KIAlrZnJlZShjbHApOw0KIH0NCiANCi0tIA0KMS43LjkuNQ0K

#1 lore raw

Tejun, maybe this could be added to your series?

(Or should I just take it without the idr_remove_all()?)

--b.

Quoted 22 lines · majianpeng

When free nfs-client, it must free the ->cl_stateids.

Signed-off-by Jianpeng Ma <[email protected]>
---
 fs/nfsd/nfs4state.c |    2 ++
 1 file changed, 2 insertions(+)
fs/nfsd/nfs4state.c +2 -0
index ac8ed96..a8309c6 100644
@@ -1060,6 +1060,8 @@ free_client(struct nfs4_client *clp)
 	}
 	free_svc_cred(&clp->cl_cred);
 	kfree(clp->cl_name.data);
+	idr_remove_all(&clp->cl_stateids);
+	idr_destroy(&clp->cl_stateids);
 	kfree(clp);
 }
Signature · 1 line
1.7.9.5
#2 lore raw

Hello,

Quoted 3 lines · bfields

Tejun, maybe this could be added to your series?

(Or should I just take it without the idr_remove_all()?)

There are gonna be other related nfs changes anyway, so I think it would be better to just route it through the usual nfs channel. We can deal with conflicts / conversion later.

Thanks.

Signature · 1 line
tejun
#3 lore raw
Quoted 10 lines · Tejun Heo

Hello,

Quoted 3 lines · bfields

Tejun, maybe this could be added to your series?

(Or should I just take it without the idr_remove_all()?)

There are gonna be other related nfs changes anyway, so I think it would be better to just route it through the usual nfs channel. We can deal with conflicts / conversion later.

Thanks, applying for 3.9.--b