The patch titled lockd-convert-reclaimer-thread-to-kthread-interface update has been added to the -mm tree. Its filename is lockd-convert-reclaimer-thread-to-kthread-interface-update.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 *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: lockd-convert-reclaimer-thread-to-kthread-interface update From: Jeff Layton <jlayton@xxxxxxxxxx> My understanding is that there is a push to turn the kernel_thread interface into a non-exported symbol and move all kernel threads to use the kthread API. This patch changes lockd to use kthread_run to spawn the reclaimer thread. I've made the assumption here that the extra module references taken when we spawn this thread are unnecessary and removed them. I've also added a KERN_ERR printk that pops if the thread can't be spawned to warn the admin that the locks won't be reclaimed. In the future, it would be nice to be able to notify userspace that locks have been lost (probably by implementing SIGLOST), and adding some good policies about how long we should reattempt to reclaim the locks. Finally, I removed a comment about memory leaks that I believe is obsolete and added a new one to clarify the result of sending a SIGKILL to the reclaimer thread. As best I can tell, doing so doesn't actually cause a memory leak. Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx> Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx> Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/lockd/clntlock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff -puN fs/lockd/clntlock.c~lockd-convert-reclaimer-thread-to-kthread-interface-update fs/lockd/clntlock.c --- a/fs/lockd/clntlock.c~lockd-convert-reclaimer-thread-to-kthread-interface-update +++ a/fs/lockd/clntlock.c @@ -237,7 +237,12 @@ restart: list_for_each_entry_safe(fl, next, &host->h_reclaim, fl_u.nfs_fl.list) { list_del_init(&fl->fl_u.nfs_fl.list); - /* Why are we leaking memory here? --okir */ + /* + * sending this thread a SIGKILL will result in any unreclaimed + * locks being removed from the h_granted list. This means that + * the kernel will not attempt to reclaim them again if a new + * reclaimer thread is spawned for this host. + */ if (signalled()) continue; if (nlmclnt_reclaim(host, fl) != 0) _ Patches currently in -mm which might be from jlayton@xxxxxxxxxx are origin.patch linux-next.patch lockd-convert-reclaimer-thread-to-kthread-interface.patch lockd-convert-reclaimer-thread-to-kthread-interface-update.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