Revision: 5451 Author: pebender Date: Thu Sep 10 08:46:08 2009 Log: - Removed patch for kernel bug 11154 as it has been fixed.
http://code.google.com/p/minimyth/source/detail?r=5451 Deleted: /trunk/gar-minimyth/script/kernel-2.6.30/linux/files/linux-2.6.30.6-bug_11154.patch /trunk/gar-minimyth/script/kernel-2.6.31/linux/files/linux-2.6.31-bug_11154.patch Modified: /trunk/gar-minimyth/script/kernel-2.6.30/linux/Makefile /trunk/gar-minimyth/script/kernel-2.6.30/linux/checksums /trunk/gar-minimyth/script/kernel-2.6.31/linux/Makefile /trunk/gar-minimyth/script/kernel-2.6.31/linux/checksums ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.30/linux/files/linux-2.6.30.6-bug_11154.patch Thu Sep 10 08:09:42 2009 +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naur linux-2.6.30.6-old/net/sunrpc/xprtsock.c linux-2.6.30.6-new/net/sunrpc/xprtsock.c ---- linux-2.6.30.6-old/net/sunrpc/xprtsock.c 2009-09-10 06:08:43.000000000 -0700 -+++ linux-2.6.30.6-new/net/sunrpc/xprtsock.c 2009-09-10 06:09:38.000000000 -0700 -@@ -1222,6 +1222,8 @@ - struct sock_xprt *transport = container_of(xprt, - struct sock_xprt, xprt); - -+ xprt->reestablish_timeout = 0; -+ - /* Reset TCP record info */ - transport->tcp_offset = 0; - transport->tcp_reclen = 0; -@@ -1236,7 +1238,6 @@ - case TCP_FIN_WAIT1: - /* The client initiated a shutdown of the socket */ - xprt->connect_cookie++; -- xprt->reestablish_timeout = 0; - set_bit(XPRT_CLOSING, &xprt->state); - smp_mb__before_clear_bit(); - clear_bit(XPRT_CONNECTED, &xprt->state); -@@ -1904,6 +1905,7 @@ - { - struct rpc_xprt *xprt = task->tk_xprt; - struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); -+ unsigned long timeout; - - if (xprt_test_and_set_connecting(xprt)) - return; -@@ -1912,12 +1914,12 @@ - dprintk("RPC: xs_connect delayed xprt %p for %lu " - "seconds\n", - xprt, xprt->reestablish_timeout / HZ); -- queue_delayed_work(rpciod_workqueue, -- &transport->connect_worker, -- xprt->reestablish_timeout); -+ timeout = xprt->reestablish_timeout; - xprt->reestablish_timeout <<= 1; - if (xprt->reestablish_timeout > XS_TCP_MAX_REEST_TO) - xprt->reestablish_timeout = XS_TCP_MAX_REEST_TO; -+ queue_delayed_work(rpciod_workqueue, -+ &transport->connect_worker, timeout); - } else { - dprintk("RPC: xs_connect scheduled xprt %p\n", xprt); - queue_delayed_work(rpciod_workqueue, ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.31/linux/files/linux-2.6.31-bug_11154.patch Thu Sep 10 08:07:33 2009 +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naur linux-2.6.31-old/net/sunrpc/xprtsock.c linux-2.6.31-new/net/sunrpc/xprtsock.c ---- linux-2.6.31-old/net/sunrpc/xprtsock.c 2009-09-10 07:41:13.000000000 -0700 -+++ linux-2.6.31-new/net/sunrpc/xprtsock.c 2009-09-10 07:42:24.000000000 -0700 -@@ -1395,6 +1395,8 @@ - struct sock_xprt *transport = container_of(xprt, - struct sock_xprt, xprt); - -+ xprt->reestablish_timeout = 0; -+ - /* Reset TCP record info */ - transport->tcp_offset = 0; - transport->tcp_reclen = 0; -@@ -1409,7 +1411,6 @@ - case TCP_FIN_WAIT1: - /* The client initiated a shutdown of the socket */ - xprt->connect_cookie++; -- xprt->reestablish_timeout = 0; - set_bit(XPRT_CLOSING, &xprt->state); - smp_mb__before_clear_bit(); - clear_bit(XPRT_CONNECTED, &xprt->state); -@@ -2078,6 +2079,7 @@ - { - struct rpc_xprt *xprt = task->tk_xprt; - struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); -+ unsigned long timeout; - - if (xprt_test_and_set_connecting(xprt)) - return; -@@ -2086,12 +2088,12 @@ - dprintk("RPC: xs_connect delayed xprt %p for %lu " - "seconds\n", - xprt, xprt->reestablish_timeout / HZ); -- queue_delayed_work(rpciod_workqueue, -- &transport->connect_worker, -- xprt->reestablish_timeout); -+ timeout = xprt->reestablish_timeout; - xprt->reestablish_timeout <<= 1; - if (xprt->reestablish_timeout > XS_TCP_MAX_REEST_TO) - xprt->reestablish_timeout = XS_TCP_MAX_REEST_TO; -+ queue_delayed_work(rpciod_workqueue, -+ &transport->connect_worker, timeout); - } else { - dprintk("RPC: xs_connect scheduled xprt %p\n", xprt); - queue_delayed_work(rpciod_workqueue, ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.30/linux/Makefile Mon Aug 17 13:59:26 2009 +++ /trunk/gar-minimyth/script/kernel-2.6.30/linux/Makefile Thu Sep 10 08:46:08 2009 @@ -6,7 +6,6 @@ CONFIGFILE = $(DISTNAME)-$(GARCH_FAMILY)-$(GARCH).config DISTFILES = $(DISTNAME).tar.bz2 $(CONFIGFILE) PATCHFILES = $(DISTNAME)-perl.patch.gar -PATCHFILES += $(DISTNAME)-bug_11154.patch PATCHFILES += $(DISTNAME)-bttv_lirc.patch PATCHFILES += $(DISTNAME)-unionfs_2.5.2.patch PATCHFILES += $(DISTNAME)-disable_dma_for_cfa.patch ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.30/linux/checksums Thu Sep 10 08:09:42 2009 +++ /trunk/gar-minimyth/script/kernel-2.6.30/linux/checksums Thu Sep 10 08:46:08 2009 @@ -1,6 +1,5 @@ 3ae3add6838da3c5a53baa87c9e32924 download/linux-2.6.30.6.tar.bz2 96a434683246e59c5441aafd3aa1236e download/linux-2.6.30.6-perl.patch.gar -8ba48789e3b6961372167438f173a37b download/linux-2.6.30.6-bug_11154.patch 033cc9cacd41e0e645ba8bbbefc18891 download/linux-2.6.30.6-bttv_lirc.patch 73a3efce567ce1be9c6fc4a7565b6ce7 download/linux-2.6.30.6-unionfs_2.5.2.patch f09d7342e503f3d98b3016dab10ceefd download/linux-2.6.30.6-disable_dma_for_cfa.patch ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.31/linux/Makefile Thu Jul 23 13:41:26 2009 +++ /trunk/gar-minimyth/script/kernel-2.6.31/linux/Makefile Thu Sep 10 08:46:08 2009 @@ -6,7 +6,6 @@ CONFIGFILE = $(DISTNAME)-$(GARCH_FAMILY)-$(GARCH).config DISTFILES = $(DISTNAME).tar.bz2 $(CONFIGFILE) PATCHFILES = $(DISTNAME)-perl.patch.gar -PATCHFILES += $(DISTNAME)-bug_11154.patch PATCHFILES += $(DISTNAME)-bttv_lirc.patch PATCHFILES += $(DISTNAME)-unionfs_2.5.2.patch PATCHFILES += $(DISTNAME)-disable_dma_for_cfa.patch ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.31/linux/checksums Thu Sep 10 08:07:33 2009 +++ /trunk/gar-minimyth/script/kernel-2.6.31/linux/checksums Thu Sep 10 08:46:08 2009 @@ -1,6 +1,5 @@ 84c077a37684e4cbfa67b18154390d8a download/linux-2.6.31.tar.bz2 2191f3bcd2e1155c16a71a1255c281f2 download/linux-2.6.31-perl.patch.gar -1c8706b902ed318b6ade008eba68d972 download/linux-2.6.31-bug_11154.patch 4b3dbd5afcc51a2081a1573be3887b9f download/linux-2.6.31-bttv_lirc.patch 0f5b59bc9d7c3bf0611b9bcedea5794d download/linux-2.6.31-unionfs_2.5.2.patch d58ff364333ffd357690fc68b81cf2b0 download/linux-2.6.31-disable_dma_for_cfa.patch --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
