[PATCH] daemonize() calls reparent_to_init cleanup

 This makes daemonize() call reparent_to_init() itself, as long
suggested for 2.5, and fixes the callers so they don't call it again.
Also fixes callers which set current->tty to NULL themselves (also
no longer neccessary).

diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index ade33def2f1b93b291a8f66d1a2711d39749e0d9..25b8e6f6b13613e1bf4c0dccca27e5dcd5d4b0c3 100644 (file)
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -232,7 +232,6 @@ int khvcd(void *unused)
        int i;
 
        daemonize();
-       reparent_to_init();
        strcpy(current->comm, "khvcd");
        sigfillset(&current->blocked);
 

diff --git a/drivers/hotplug/ibmphp_hpc.c b/drivers/hotplug/ibmphp_hpc.c
index deb03286c737b8e10e726dfd00045f99232a4390..bf2e067aaad0dfb982390f51cc5a8381566bb077 100644 (file)
--- a/drivers/hotplug/ibmphp_hpc.c
+++ b/drivers/hotplug/ibmphp_hpc.c
@@ -1025,7 +1025,6 @@ static int hpc_poll_thread (void *data)
        debug ("%s - Entry\n", __FUNCTION__);
        lock_kernel ();
        daemonize ();
-       reparent_to_init ();
 
        //  New name
        strcpy (current->comm, "hpc_poll");

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 41b8c222a538c81e033123a71f2d3c5648b6e8a0..16496cc15d770f93070907c6df07ff8529d17079 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2486,7 +2486,6 @@ int md_thread(void * arg)
         */
 
        daemonize();
-       reparent_to_init();
 
        sprintf(current->comm, thread->name);
        current->exit_signal = SIGCHLD;

diff --git a/drivers/mtd/devices/blkmtd.c b/drivers/mtd/devices/blkmtd.c
index 5394aedbd739334335e40e820ea0ea966f733a3d..f1f295916ab6291442fda336eacd57f32eac8014 100644 (file)
--- a/drivers/mtd/devices/blkmtd.c
+++ b/drivers/mtd/devices/blkmtd.c
@@ -304,7 +304,6 @@ static int write_queue_task(void *data)
   DEBUG(1, "blkmtd: writetask: starting (pid = %d)\n", tsk->pid);
   daemonize();
   strcpy(tsk->comm, "blkmtdd");
-  tsk->tty = NULL;
   spin_lock_irq(&tsk->sigmask_lock);
   sigfillset(&tsk->blocked);
   recalc_sigpending();

diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 02f6bb9728f086430fd893f3cacb47d37d872528..e26557f6e15d9afaa5041c9af3bb14992d6d83c3 100644 (file)
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -1582,8 +1582,7 @@ static int rtl8139_thread (void *data)
        struct rtl8139_private *tp = dev->priv;
        unsigned long timeout;
 
-       daemonize ();
-       reparent_to_init();
+       daemonize();
        spin_lock_irq(&current->sigmask_lock);
        sigemptyset(&current->blocked);
        recalc_sigpending();

diff --git a/drivers/pnp/pnpbios_core.c b/drivers/pnp/pnpbios_core.c
index 64fba3f9d324c0787e4698943cd3d63b87e989bc..f361240fd8ced49b7cadceb1881abb4df38cf181 100644 (file)
--- a/drivers/pnp/pnpbios_core.c
+++ b/drivers/pnp/pnpbios_core.c
@@ -616,7 +616,6 @@ static int pnp_dock_thread(void * unused)
        static struct pnp_docking_station_info now;
        int docked = -1, d = 0;
        daemonize();
-       reparent_to_init();
        strcpy(current->comm, "kpnpbiosd");
        while(!unloading && !signal_pending(current))
        {

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 1c364e823c872a606e995b3abb2033167f9b188d..11d9307d20f02e96ab8ff009f3afb4f68d0963a7 100644 (file)
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1878,7 +1878,6 @@ void scsi_error_handler(void *data)
         */
 
        daemonize();
-       reparent_to_init();
 
        /*
         * Set the name of this process.

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 66226ab2f6d34e2b91176b248623e95f77968485..84a72fde8a7535d3d9d513279fa10eb8c62e5d65 100644 (file)
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -309,7 +309,6 @@ static int usb_stor_control_thread(void * __us)
         * so get rid of all our resources..
         */
        daemonize();
-       reparent_to_init();
 
        /* avoid getting signals */
        spin_lock_irq(&current->sigmask_lock);

diff --git a/fs/jffs2/background.c b/fs/jffs2/background.c
index 6a672556dddb8489f35029b76c91f997e9b6d98b..c7af1832027ca74a988c2dd8d0c2ef80c0044339 100644 (file)
--- a/fs/jffs2/background.c
+++ b/fs/jffs2/background.c
@@ -83,7 +83,6 @@ static int jffs2_garbage_collect_thread(void *_c)
        struct jffs2_sb_info *c = _c;
 
        daemonize();
-       current->tty = NULL;
        c->gc_task = current;
        up(&c->gc_thread_start);
 

diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 4be67ecacc9ab661bf0c8723a481b60f68eb80b1..86c1c4254ce18044917b11541789c965cc2f43dd 100644 (file)
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -2114,7 +2114,6 @@ int jfsIOWait(void *arg)
        lock_kernel();
 
        daemonize();
-       current->tty = NULL;
        strcpy(current->comm, "jfsIO");
 
        unlock_kernel();

diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index 27bcdb39a458f8d03b3c7ddd69b12e71c3bf540e..7f0cac396c9067a19e47657c65a6d37539599485 100644 (file)
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -2763,7 +2763,6 @@ int jfs_lazycommit(void *arg)
        lock_kernel();
 
        daemonize();
-       current->tty = NULL;
        strcpy(current->comm, "jfsCommit");
 
        unlock_kernel();
@@ -2961,7 +2960,6 @@ int jfs_sync(void *arg)
        lock_kernel();
 
        daemonize();
-       current->tty = NULL;
        strcpy(current->comm, "jfsSync");
 
        unlock_kernel();

diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index f38a040578fdd0cd3820b2778b7699461db7b636..239fa43429bb9a313611bfb0f67b935582fb28ce 100644 (file)
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -202,7 +202,6 @@ reclaimer(void *ptr)
        struct inode *inode;
 
        daemonize();
-       reparent_to_init();
        snprintf(current->comm, sizeof(current->comm),
                 "%s-reclaim",
                 host->h_name);

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index dd0c9c841062421a8e5ff811d41ae0feaaa8df0e..00b0c201b8309e35a30749fa4721664d9b5dda7e 100644 (file)
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -98,7 +98,6 @@ lockd(struct svc_rqst *rqstp)
        up(&lockd_start);
 
        daemonize();
-       reparent_to_init();
        sprintf(current->comm, "lockd");
 
        /* Process request with signals blocked.  */

diff --git a/kernel/exit.c b/kernel/exit.c
index 6a6c8c781855c0877777c56fb403edd499b56a3e..1c028b92b9ed7d437cfbd78a81b183c42725ccc5 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -232,6 +232,8 @@ void daemonize(void)
        exit_files(current);
        current->files = init_task.files;
        atomic_inc(&current->files->count);
+
+       reparent_to_init();
 }
 
 static void reparent_thread(task_t *p, task_t *reaper, task_t *child_reaper)

diff --git a/kernel/ksyms.c b/kernel/ksyms.c
index ad618a550f86580741e742b69f52b27a096380a6..f3e982d4aa52061d79f283e1006f1b7c750b82cf 100644 (file)
--- a/kernel/ksyms.c
+++ b/kernel/ksyms.c
@@ -524,7 +524,6 @@ EXPORT_SYMBOL(secure_tcp_sequence_number);
 EXPORT_SYMBOL(get_random_bytes);
 EXPORT_SYMBOL(securebits);
 EXPORT_SYMBOL(cap_bset);
-EXPORT_SYMBOL(reparent_to_init);
 EXPORT_SYMBOL(daemonize);
 EXPORT_SYMBOL(csum_partial); /* for networking and md */
 EXPORT_SYMBOL(seq_escape);

diff --git a/mm/pdflush.c b/mm/pdflush.c
index 26fef9bc32356c5dc16dcccfcbbf8e652414150f..a380584744ae5115d41ac1e16d97ddf232ad5049 100644 (file)
--- a/mm/pdflush.c
+++ b/mm/pdflush.c
@@ -88,7 +88,6 @@ struct pdflush_work {
 static int __pdflush(struct pdflush_work *my_work)
 {
        daemonize();
-       reparent_to_init();
        strcpy(current->comm, "pdflush");
 
        /* interruptible sleep, so block all signals */