2008-12-10 19:40:42

by Steven Rostedt

Subject: [PATCH] use rwlock runtime init for drivers/isdn/mISDN/tei.c

The following patch is in:

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git

branch: cleanups


Steven Rostedt (1):
use rwlock runtime init for drivers/isdn/mISDN/tei.c

----
drivers/isdn/mISDN/tei.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---------------------------
commit 30bb0d7d6956526eedb5ad30b9d6ff085801d788
Author: Steven Rostedt <[email protected]>
Date: Wed Dec 10 14:25:23 2008 -0500

use rwlock runtime init for drivers/isdn/mISDN/tei.c

Impact: clean up

__RW_LOCK_UNLOCKED(lock) is meant for compile time initializations.
rwlock_init(&lock) is used for run time initialization.

This patch converts drivers/isdn/mISDN/tei.c to initialize the
mrg->lock rwlock.

Signed-off-by: Steven Rostedt <[email protected]>

diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
index 6fbae42..d8af45c 100644
--- a/drivers/isdn/mISDN/tei.c
+++ b/drivers/isdn/mISDN/tei.c
@@ -1287,7 +1287,7 @@ create_teimanager(struct mISDNdevice *dev)
if (!mgr)
return -ENOMEM;
INIT_LIST_HEAD(&mgr->layer2);
- mgr->lock = __RW_LOCK_UNLOCKED(mgr->lock);
+ rwlock_init(&mgr->lock);
skb_queue_head_init(&mgr->sendq);
mgr->nextid = 1;
mgr->lastid = MISDN_ID_NONE;

2008-12-11 09:57:12

by Karsten Keil

Subject: Re: [PATCH] use rwlock runtime init for drivers/isdn/mISDN/tei.c

On Wed, Dec 10, 2008 at 02:40:32PM -0500, Steven Rostedt wrote:
>
Thanks for bring up this again, I already sent this patch
several times some months ago:


>From 65b212b2e8dc37904e3b88882fa15cf9eceb3510 Mon Sep 17 00:00:00 2001
From: Karsten Keil <[email protected]>
Date: Wed, 6 Aug 2008 15:14:58 +0200
Subject: [PATCH] Fix lockdep warning

use correct dynamic spinlock init function.

Signed-off-by: Karsten Keil <[email protected]>
---
drivers/isdn/mISDN/tei.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
index 6fbae42..d8af45c 100644
--- a/drivers/isdn/mISDN/tei.c
+++ b/drivers/isdn/mISDN/tei.c
@@ -1287,7 +1287,7 @@ create_teimanager(struct mISDNdevice *dev)
if (!mgr)
return -ENOMEM;
INIT_LIST_HEAD(&mgr->layer2);
- mgr->lock = __RW_LOCK_UNLOCKED(mgr->lock);
+ rwlock_init(&mgr->lock);
skb_queue_head_init(&mgr->sendq);
mgr->nextid = 1;
mgr->lastid = MISDN_ID_NONE;
--
1.5.6.4



> The following patch is in:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
>
> branch: cleanups
>
>
> Steven Rostedt (1):
> use rwlock runtime init for drivers/isdn/mISDN/tei.c
>
> ----
> drivers/isdn/mISDN/tei.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> ---------------------------
> commit 30bb0d7d6956526eedb5ad30b9d6ff085801d788
> Author: Steven Rostedt <[email protected]>
> Date: Wed Dec 10 14:25:23 2008 -0500
>
> use rwlock runtime init for drivers/isdn/mISDN/tei.c
>
> Impact: clean up
>
> __RW_LOCK_UNLOCKED(lock) is meant for compile time initializations.
> rwlock_init(&lock) is used for run time initialization.
>
> This patch converts drivers/isdn/mISDN/tei.c to initialize the
> mrg->lock rwlock.
>
> Signed-off-by: Steven Rostedt <[email protected]>
>
> diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
> index 6fbae42..d8af45c 100644
> --- a/drivers/isdn/mISDN/tei.c
> +++ b/drivers/isdn/mISDN/tei.c
> @@ -1287,7 +1287,7 @@ create_teimanager(struct mISDNdevice *dev)
> if (!mgr)
> return -ENOMEM;
> INIT_LIST_HEAD(&mgr->layer2);
> - mgr->lock = __RW_LOCK_UNLOCKED(mgr->lock);
> + rwlock_init(&mgr->lock);
> skb_queue_head_init(&mgr->sendq);
> mgr->nextid = 1;
> mgr->lastid = MISDN_ID_NONE;

--
Karsten Keil
SuSE Labs
ISDN and VOIP development
SUSE LINUX Products GmbH, Maxfeldstr.5 90409 Nuernberg, GF: Markus Rex, HRB 16746 (AG Nuernberg)

2008-12-13 05:22:23

by David Miller

Subject: Re: [PATCH] use rwlock runtime init for drivers/isdn/mISDN/tei.c

From: Karsten Keil <[email protected]>
Date: Thu, 11 Dec 2008 10:56:53 +0100

> Subject: [PATCH] Fix lockdep warning
>
> use correct dynamic spinlock init function.
>
> Signed-off-by: Karsten Keil <[email protected]>

Applied to net-next-2.6, thanks Karsten.