Re: [PATCH] replace deprecated RW_LOCK_UNLOCKED in net/dccp/proto.c

From: Eric Dumazet
Date: Wed Dec 10 2008 - 13:35:52 EST


cced netdev

Steven Rostedt a écrit :
> 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):
> replace deprecated RW_LOCK_UNLOCKED in net/dccp/proto.c
>
> ----
> net/dccp/proto.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> ---------------------------
> commit 3e1de819261b68a48b09719694c7e3579a8e4186
> Author: Steven Rostedt <srostedt@xxxxxxxxxx>
> Date: Wed Dec 10 12:49:47 2008 -0500
>
> replace deprecated RW_LOCK_UNLOCKED in net/dccp/proto.c
>
> Impact: clean up
>
> RW_LOCK_UNLOCKED has been deprecated and superseded by
> __RW_LOCK_UNLOCKED(name). This patch removes one of the last
> remaining users of it.
>
> Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
>
> diff --git a/net/dccp/proto.c b/net/dccp/proto.c
> index d0bd348..e6e54a7 100644
> --- a/net/dccp/proto.c
> +++ b/net/dccp/proto.c
> @@ -45,7 +45,7 @@ atomic_t dccp_orphan_count = ATOMIC_INIT(0);
> EXPORT_SYMBOL_GPL(dccp_orphan_count);
>
> struct inet_hashinfo __cacheline_aligned dccp_hashinfo = {
> - .lhash_lock = RW_LOCK_UNLOCKED,
> + .lhash_lock = __RW_LOCK_UNLOCKED(dccp_hashinfo.lhash_lock),
> .lhash_users = ATOMIC_INIT(0),
> .lhash_wait = __WAIT_QUEUE_HEAD_INITIALIZER(dccp_hashinfo.lhash_wait),
> };
> --

Hum... this rwlock doesnt exist anymore on net-next-2.6, all this stuff
was converted to RCU for upcoming 2.6.29

struct inet_hashinfo dccp_hashinfo;
EXPORT_SYMBOL_GPL(dccp_hashinfo);

I guess such a patch wont ease David job when 2.6.29 merge window opens


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/