rpms/kernel/devel linux-2.6-lockdep-fixes.patch,1.33,1.34

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Sep 27 19:52:43 UTC 2006


Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16066

Modified Files:
	linux-2.6-lockdep-fixes.patch 
Log Message:
bad patch

linux-2.6-lockdep-fixes.patch:
 a/drivers/ieee1394/nodemgr.c                         |    9 
 a/drivers/net/forcedeth.c                            |   31 +--
 a/fs/nfsd/nfsproc.c                                  |    2 
 a/fs/nfsd/vfs.c                                      |    8 
 a/include/linux/nfsd/nfsfh.h                         |   11 -
 a/kernel/lockdep.c                                   |   13 +
 a/net/ipv6/tcp_ipv6.c                                |    2 
 b/net/core/dev.c                                     |   14 -
 b/net/sched/cls_api.c                                |    4 
 b/net/sched/sch_api.c                                |   16 -
 b/net/sched/sch_generic.c                            |   66 ++----
 fs/block_dev.c                                       |   11 -
 linux-2.6.17-mm6/include/net/sock.h                  |   33 +++
 linux-2.6.17.noarch/drivers/char/rtc.c               |    5 
 linux-2.6.18-rc1/drivers/input/serio/libps2.c        |    6 
 linux-2.6.18-rc1/include/linux/libps2.h              |   12 +
 linux-2.6.18-rc1/net/socket.c                        |    8 
 linux-2.6.18.noarch/block/ioctl.c                    |    4 
 linux-2.6.18.noarch/drivers/char/sysrq.c             |   17 +
 linux-2.6.18.noarch/drivers/input/serio/libps2.c     |    4 
 linux-2.6.18.noarch/drivers/input/serio/serio.c      |    9 
 linux-2.6.18.noarch/drivers/md/md.c                  |    6 
 linux-2.6.18.noarch/drivers/usb/serial/cyberjack.c   |    6 
 linux-2.6.18.noarch/drivers/usb/serial/generic.c     |    6 
 linux-2.6.18.noarch/drivers/usb/serial/ipw.c         |    6 
 linux-2.6.18.noarch/drivers/usb/serial/ir-usb.c      |    6 
 linux-2.6.18.noarch/drivers/usb/serial/keyspan_pda.c |    6 
 linux-2.6.18.noarch/drivers/usb/serial/omninet.c     |    6 
 linux-2.6.18.noarch/drivers/usb/serial/safe_serial.c |    6 
 linux-2.6.18.noarch/fs/block_dev.c                   |  180 +++++--------------
 linux-2.6.18.noarch/include/linux/fs.h               |   17 -
 linux-2.6.18.noarch/include/linux/lockdep.h          |   12 -
 linux-2.6.18.noarch/include/linux/serio.h            |    1 
 linux-2.6.18.noarch/kernel/lockdep.c                 |   10 -
 linux-2.6.18.noarch/kernel/mutex-debug.c             |    2 
 linux-2.6.18.noarch/lib/rwsem-spinlock.c             |    2 
 linux-2.6.18.noarch/lib/rwsem.c                      |    2 
 linux-2.6.18.noarch/lib/spinlock_debug.c             |    4 
 linux-2.6.18.noarch/net/core/sock.c                  |    2 
 linux-2.6/mm/slab.c                                  |   55 ++++-
 40 files changed, 323 insertions(+), 297 deletions(-)

Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- linux-2.6-lockdep-fixes.patch	27 Sep 2006 18:49:36 -0000	1.33
+++ linux-2.6-lockdep-fixes.patch	27 Sep 2006 19:52:41 -0000	1.34
@@ -2498,128 +2498,6 @@
 
 --
 
-From davej  Wed Sep 27 06:53:45 2006
-Return-Path: <pzijlstr at redhat.com>
-X-Spam-Checker-Version: SpamAssassin 3.1.4 (2006-07-25) on 
-	pressure.kernelslacker.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-1.2 required=5.0 tests=AWL,BAYES_00,
-	UNPARSEABLE_RELAY autolearn=ham version=3.1.4
-Received: from pobox.devel.redhat.com [10.11.255.8]
-	by pressure.kernelslacker.org with IMAP (fetchmail-6.3.4)
-	for <davej at localhost> (single-drop); Wed, 27 Sep 2006 06:53:45 -0400 (EDT)
-Received: from pobox.devel.redhat.com ([unix socket])
-	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
-	 Wed, 27 Sep 2006 06:52:43 -0400
-X-Sieve: CMU Sieve 2.2
-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
-	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k8RAqhpa010061;
-	Wed, 27 Sep 2006 06:52:43 -0400
-Received: from pobox.stuttgart.redhat.com (pobox.stuttgart.redhat.com [172.16.2.10])
-	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k8RAqgh8007994;
-	Wed, 27 Sep 2006 06:52:43 -0400
-Received: from vpn-4-64.str.redhat.com (vpn-4-64.str.redhat.com [10.32.4.64])
-	by pobox.stuttgart.redhat.com (8.12.8/8.12.8) with ESMTP id k8RAqgcG025284;
-	Wed, 27 Sep 2006 12:52:42 +0200
-Subject: NFS vs Net lockdep warning
-From: Peter Zijlstra <pzijlstr at redhat.com>
-To: Dave Jones <davej at redhat.com>
-Cc: drepper at redhat.com
-Content-Type: text/plain
-Date: Wed, 27 Sep 2006 12:52:14 +0200
-Message-Id: <1159354334.2789.36.camel at taijtu>
-Mime-Version: 1.0
-X-Mailer: Evolution 2.6.3 (2.6.3-1.fc5.5) 
-Content-Transfer-Encoding: 7bit
-Status: RO
-X-Status: A
-Content-Length: 2361
-Lines: 83
-
-Hi Dave,
-
-http://lkml.org/lkml/2006/7/13/3
-
-suggests you got bitten by:
-  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=205487
-
-as well, I tried to reproduce by creating a user with his home on an NFS
-mount and doing stuff like starting firefox and play around a bit, but
-alas, nothing happened.
-
-Could you see if this solves it?
-
-kernel compiles, boots and mounts nfs volumes.
-
----
-
-Stick NFS sockets in their own class to avoid some lockdep warnings.
-NFS sockets are never exposed to user-space, and will hence not trigger
-certain code paths that would otherwise pose deadlock scenarios.
-
-Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
----
- net/sunrpc/xprtsock.c |   31 +++++++++++++++++++++++++++++++
- 1 file changed, 31 insertions(+)
-
-Index: linux-2.6/net/sunrpc/xprtsock.c
-===================================================================
---- linux-2.6.orig/net/sunrpc/xprtsock.c
-+++ linux-2.6/net/sunrpc/xprtsock.c
-@@ -1004,6 +1004,35 @@ static int xs_bindresvport(struct rpc_xp
- 	return err;
- }
- 
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+
-+static struct lock_class_key xs_key;
-+static struct lock_class_key xs_slock_key;
-+
-+static inline void xs_reclassify_socket(struct socket *sock)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	BUG_ON(sk->sk_lock.owner != NULL);
-+	BUG_ON(sk->sk_family != AF_INET);
-+	/*
-+	 * duplicated from sock_lock_init()
-+	 */
-+	spin_lock_init(&sk->sk_lock.slock);
-+	debug_check_no_locks_freed((void *)&sk->sk_lock, sizeof(sk->sk_lock));
-+	lockdep_set_class_and_name(&sk->sk_lock.slock, &xs_slock_key,
-+				   "slock-AF_INET-NFS");
-+	lockdep_init_map(&sk->sk_lock.dep_map, "sk_lock-AF_INET-NFS", &xs_key);
-+}
-+
-+#else
-+
-+static inline void xs_reclassify_socket(struct socket *sock)
-+{
-+}
-+
-+#endif
-+
- /**
-  * xs_udp_connect_worker - set up a UDP socket
-  * @args: RPC transport to connect
-@@ -1028,6 +1057,7 @@ static void xs_udp_connect_worker(void *
- 		dprintk("RPC:      can't create UDP transport socket (%d).\n", -err);
- 		goto out;
- 	}
-+	xs_reclassify_socket(sock);
- 
- 	if (xprt->resvport && xs_bindresvport(xprt, sock) < 0) {
- 		sock_release(sock);
-@@ -1110,6 +1140,7 @@ static void xs_tcp_connect_worker(void *
- 			dprintk("RPC:      can't create TCP transport socket (%d).\n", -err);
- 			goto out;
- 		}
-+		xs_reclassify_socket(sock);
- 
- 		if (xprt->resvport && xs_bindresvport(xprt, sock) < 0) {
- 			sock_release(sock);
-
-
 From davej  Wed Sep 27 08:07:25 2006
 Return-Path: <kaber at trash.net>
 X-Spam-Checker-Version: SpamAssassin 3.1.4 (2006-07-25) on 




More information about the fedora-cvs-commits mailing list