Date: Tue, 26 Nov 2002 14:53:22 +0100
From: Petr Vandrovec <vandrove@vc.cvut.cz>
To: torvalds@transmeta.com
Cc: alan@lxorguk.ukuu.org.uk, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ncpfs seems to need the timer init
Message-ID: <20021126135322.GA30362@vana>
References: <200211260411.gAQ4BUo24135@hera.kernel.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200211260411.gAQ4BUo24135@hera.kernel.org>
User-Agent: Mutt/1.4i
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1712
Lines: 49

On Tue, Nov 26, 2002 at 02:12:52AM +0000, Linux Kernel Mailing List wrote:

Linus, please revert this. It is changeset 

alan@lxorguk.ukuu.org.uk|ChangeSet|20021126021252|43411

Timer is already initialized few lines above in the code. If you'll look
through fs/ncpfs/inode.c history, you'll find that I already asked once
for removing this redundant timer initialization, but unfortunately it
found its way to the tree again :-(

I prefer having init_timer() and timeout_tm setup separate, as now
I can safely call del_timer in shutdown without having to test
whether I'm in UDP or TCP code...

					Thanks,
						Petr Vandrovec
						vandrove@vc.cvut.cz

> ChangeSet 1.842.42.99, 2002/11/25 18:12:52-08:00, alan@lxorguk.ukuu.org.uk
> 
> 	[PATCH] ncpfs seems to need the timer init
> 
> 
> # This patch includes the following deltas:
> #	           ChangeSet	1.842.42.98 -> 1.842.42.99
> #	    fs/ncpfs/inode.c	1.36    -> 1.37   
> #
> 
>  inode.c |    1 +
>  1 files changed, 1 insertion(+)
> 
> 
> diff -Nru a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
> --- a/fs/ncpfs/inode.c	Mon Nov 25 20:11:32 2002
> +++ b/fs/ncpfs/inode.c	Mon Nov 25 20:11:32 2002
> @@ -575,6 +575,7 @@
>  	} else {
>  		INIT_WORK(&server->rcv.tq, ncpdgram_rcv_proc, server);
>  		INIT_WORK(&server->timeout_tq, ncpdgram_timeout_proc, server);
> +		init_timer(&server->timeout_tm);
>  		server->timeout_tm.data = (unsigned long)server;
>  		server->timeout_tm.function = ncpdgram_timeout_call;
>  	}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/