From 863c4a1615279c38ae4c61bf576d346ce0ae1f4c Mon Sep 17 00:00:00 2001 From: Albert Cahalan Date: Sun, 21 Sep 2003 05:40:40 -0700 Subject: [PATCH] [PATCH] use CLONE_KERNEL This uses CLONE_KERNEL in place of the individual flags, only changing the places where it is an exact match. I strongly suspect that CLONE_KERNEL ought to be used in many more places, but they require a more careful examination. --- arch/arm/kernel/ecard.c | 3 +-- arch/i386/kernel/apm.c | 2 +- arch/ia64/sn/io/sn2/shub.c | 2 +- drivers/block/loop.c | 2 +- drivers/ieee1394/nodemgr.c | 3 +-- drivers/input/serio/serio.c | 3 +-- drivers/isdn/hardware/eicon/i4lididrv.c | 2 +- drivers/macintosh/adb.c | 3 +-- drivers/macintosh/mediabay.c | 3 +-- drivers/mtd/mtd_blkdevs.c | 3 +-- drivers/usb/core/hub.c | 3 +-- fs/jffs/inode-v23.c | 2 +- fs/jfs/super.c | 9 +++------ net/bluetooth/bnep/core.c | 2 +- net/bluetooth/rfcomm/core.c | 2 +- 15 files changed, 17 insertions(+), 27 deletions(-) diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c index 9588b86f78a68..0a021712b8273 100644 --- a/arch/arm/kernel/ecard.c +++ b/arch/arm/kernel/ecard.c @@ -329,8 +329,7 @@ ecard_call(struct ecard_request *req) BUG(); if (ecard_pid <= 0) - ecard_pid = kernel_thread(ecard_task, NULL, - CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + ecard_pid = kernel_thread(ecard_task, NULL, CLONE_KERNEL); ecard_req = req; wake_up(&ecard_wait); diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c index 6651e1941eaaf..036a2a4d73a1f 100644 --- a/arch/i386/kernel/apm.c +++ b/arch/i386/kernel/apm.c @@ -2008,7 +2008,7 @@ static int __init apm_init(void) if (apm_proc) apm_proc->owner = THIS_MODULE; - kernel_thread(apm, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND | SIGCHLD); + kernel_thread(apm, NULL, CLONE_KERNEL | SIGCHLD); if (num_online_cpus() > 1 && !smp ) { printk(KERN_NOTICE diff --git a/arch/ia64/sn/io/sn2/shub.c b/arch/ia64/sn/io/sn2/shub.c index ac9d9add5c180..b7af0bdd0ff43 100644 --- a/arch/ia64/sn/io/sn2/shub.c +++ b/arch/ia64/sn/io/sn2/shub.c @@ -493,7 +493,7 @@ linkstatd_init(void) spin_lock_init(&sn_linkstats_lock); sn_linkstats = kmalloc(numnodes * sizeof(struct s_linkstats), GFP_KERNEL); sn_linkstats_reset(60000UL); /* default 60 second update interval */ - kernel_thread(linkstatd_thread, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + kernel_thread(linkstatd_thread, NULL, CLONE_KERNEL); return 0; } diff --git a/drivers/block/loop.c b/drivers/block/loop.c index a5c2ce9cf1890..eda9681d1253b 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -757,7 +757,7 @@ static int loop_set_fd(struct loop_device *lo, struct file *lo_file, blk_queue_merge_bvec(lo->lo_queue, q->merge_bvec_fn); } - kernel_thread(loop_thread, lo, CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + kernel_thread(loop_thread, lo, CLONE_KERNEL); down(&lo->lo_sem); fput(file); diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 26c0af5eec9f2..b38f1e83d865f 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c @@ -1744,8 +1744,7 @@ static void nodemgr_add_host(struct hpsb_host *host) sprintf(hi->daemon_name, "knodemgrd_%d", host->id); - hi->pid = kernel_thread(nodemgr_host_thread, hi, - CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + hi->pid = kernel_thread(nodemgr_host_thread, hi, CLONE_KERNEL); if (hi->pid < 0) { HPSB_ERR ("NodeMgr: failed to start %s thread for %s", diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c index 7c818a32628ab..2288eb45f1bec 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c @@ -248,8 +248,7 @@ static int __init serio_init(void) { int pid; - pid = kernel_thread(serio_thread, NULL, - CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + pid = kernel_thread(serio_thread, NULL, CLONE_KERNEL); if (!pid) { printk(KERN_WARNING "serio: Failed to start kseriod\n"); diff --git a/drivers/isdn/hardware/eicon/i4lididrv.c b/drivers/isdn/hardware/eicon/i4lididrv.c index c1a8be7e19c4f..5eda595b7f2f9 100644 --- a/drivers/isdn/hardware/eicon/i4lididrv.c +++ b/drivers/isdn/hardware/eicon/i4lididrv.c @@ -293,7 +293,7 @@ diva_init_thread(void) { int pid = 0; - pid = kernel_thread(divad_thread, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + pid = kernel_thread(divad_thread, NULL, CLONE_KERNEL); if (pid >= 0) { divad_pid = pid; } diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c index 438e05f462d5d..a20a9e899ef40 100644 --- a/drivers/macintosh/adb.c +++ b/drivers/macintosh/adb.c @@ -266,8 +266,7 @@ adb_probe_task(void *x) static void __adb_probe_task(void *data) { - adb_probe_task_pid = kernel_thread(adb_probe_task, NULL, - SIGCHLD | CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + adb_probe_task_pid = kernel_thread(adb_probe_task, NULL, SIGCHLD | CLONE_KERNEL); } static DECLARE_WORK(adb_reset_work, __adb_probe_task, NULL); diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index 5b4ab407765bd..89d4aaaf622f0 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c @@ -694,8 +694,7 @@ static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_ma /* Startup kernel thread */ if (i == 0) - kernel_thread(media_bay_task, NULL, - CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + kernel_thread(media_bay_task, NULL, CLONE_KERNEL); return 0; diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c index 55528181ab92c..60efe39db6cd5 100644 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c @@ -397,8 +397,7 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr) tr->blkcore_priv->rq->queuedata = tr; - ret = kernel_thread(mtd_blktrans_thread, tr, - CLONE_FS|CLONE_FILES|CLONE_SIGHAND); + ret = kernel_thread(mtd_blktrans_thread, tr, CLONE_KERNEL); if (ret < 0) { blk_cleanup_queue(tr->blkcore_priv->rq); unregister_blkdev(tr->major, tr->name); diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index fac5883fd1a7e..dc12ba0c97224 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1182,8 +1182,7 @@ int usb_hub_init(void) return -1; } - pid = kernel_thread(hub_thread, NULL, - CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + pid = kernel_thread(hub_thread, NULL, CLONE_KERNEL); if (pid >= 0) { khubd_pid = pid; diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c index b8a284f1bee37..9ad5717a56902 100644 --- a/fs/jffs/inode-v23.c +++ b/fs/jffs/inode-v23.c @@ -139,7 +139,7 @@ static int jffs_fill_super(struct super_block *sb, void *data, int silent) c->thread_pid = kernel_thread (jffs_garbage_collect_thread, (void *) c, - CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + CLONE_KERNEL); D1(printk(KERN_NOTICE "JFFS: GC thread pid=%d.\n", (int) c->thread_pid)); D1(printk(KERN_NOTICE "JFFS: Successfully mounted device %s.\n", diff --git a/fs/jfs/super.c b/fs/jfs/super.c index ccb2a613da96f..0167601c03d3f 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c @@ -501,24 +501,21 @@ static int __init init_jfs_fs(void) /* * I/O completion thread (endio) */ - jfsIOthread = kernel_thread(jfsIOWait, 0, - CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + jfsIOthread = kernel_thread(jfsIOWait, 0, CLONE_KERNEL); if (jfsIOthread < 0) { jfs_err("init_jfs_fs: fork failed w/rc = %d", jfsIOthread); goto end_txmngr; } wait_for_completion(&jfsIOwait); /* Wait until thread starts */ - jfsCommitThread = kernel_thread(jfs_lazycommit, 0, - CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + jfsCommitThread = kernel_thread(jfs_lazycommit, 0, CLONE_KERNEL); if (jfsCommitThread < 0) { jfs_err("init_jfs_fs: fork failed w/rc = %d", jfsCommitThread); goto kill_iotask; } wait_for_completion(&jfsIOwait); /* Wait until thread starts */ - jfsSyncThread = kernel_thread(jfs_sync, 0, - CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + jfsSyncThread = kernel_thread(jfs_sync, 0, CLONE_KERNEL); if (jfsSyncThread < 0) { jfs_err("init_jfs_fs: fork failed w/rc = %d", jfsSyncThread); goto kill_committask; diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c index 81fc01a99dd8a..19704fd1528ef 100644 --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c @@ -574,7 +574,7 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock) __bnep_link_session(s); - err = kernel_thread(bnep_session, s, CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + err = kernel_thread(bnep_session, s, CLONE_KERNEL); if (err < 0) { /* Session thread start failed, gotta cleanup. */ unregister_netdev(dev); diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 5d88ff0097534..148be892afe6a 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -1957,7 +1957,7 @@ int __init rfcomm_init(void) { l2cap_load(); - kernel_thread(rfcomm_run, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND); + kernel_thread(rfcomm_run, NULL, CLONE_KERNEL); BT_INFO("RFCOMM ver %s", VERSION); -- 2.53.0