[PPP] synchronous tty: convert dead_sem to completion (5e41fb83) · Commits · 戴 / test

drivers/net/ppp_synctty.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -42,9 +42,9 @@
		#include <linux/if_ppp.h>
		#include <linux/ppp_channel.h>
		#include <linux/spinlock.h>
		#include <linux/completion.h>
		#include <linux/init.h>
		#include <asm/uaccess.h>
		#include <asm/semaphore.h>

		#define PPP_VERSION "2.4.2"

		@@ -70,7 +70,7 @@ struct syncppp {
		struct tasklet_struct tsk;

		atomic_t refcnt;
		struct semaphore dead_sem;
		struct completion dead_cmp;
		struct ppp_channel chan; /* interface to generic ppp layer */
		};

		@@ -195,7 +195,7 @@ static struct syncppp sp_get(struct tty_struct tty)
		static void sp_put(struct syncppp *ap)
		{
		if (atomic_dec_and_test(&ap->refcnt))
		up(&ap->dead_sem);
		complete(&ap->dead_cmp);
		}

		/*
		@@ -225,7 +225,7 @@ ppp_sync_open(struct tty_struct *tty)
		tasklet_init(&ap->tsk, ppp_sync_process, (unsigned long) ap);

		atomic_set(&ap->refcnt, 1);
		init_MUTEX_LOCKED(&ap->dead_sem);
		init_completion(&ap->dead_cmp);

		ap->chan.private = ap;
		ap->chan.ops = &sync_ops;
		@@ -273,7 +273,7 @@ ppp_sync_close(struct tty_struct *tty)
		* by the time it returns.
		*/
		if (!atomic_dec_and_test(&ap->refcnt))
		down(&ap->dead_sem);
		wait_for_completion(&ap->dead_cmp);
		tasklet_kill(&ap->tsk);

		ppp_unregister_channel(&ap->chan);