From: Greg Kroah-Hartman Date: Fri, 23 Jan 2009 01:14:02 +0000 (-0800) Subject: start 2.6.28.2 review cycle X-Git-Tag: v2.6.27.13~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10eec72799d4b729e1f469da5aaec127d27d6877;p=thirdparty%2Fkernel%2Fstable-queue.git start 2.6.28.2 review cycle --- diff --git a/queue-2.6.28/alsa-hda-add-automatic-model-setting-for-samsung-q45.patch b/review-2.6.28/alsa-hda-add-automatic-model-setting-for-samsung-q45.patch similarity index 100% rename from queue-2.6.28/alsa-hda-add-automatic-model-setting-for-samsung-q45.patch rename to review-2.6.28/alsa-hda-add-automatic-model-setting-for-samsung-q45.patch diff --git a/queue-2.6.28/alsa-hda-add-quirk-for-another-hp-dv5.patch b/review-2.6.28/alsa-hda-add-quirk-for-another-hp-dv5.patch similarity index 100% rename from queue-2.6.28/alsa-hda-add-quirk-for-another-hp-dv5.patch rename to review-2.6.28/alsa-hda-add-quirk-for-another-hp-dv5.patch diff --git a/queue-2.6.28/alsa-hda-don-t-reset-hp-pinctl-in-patch_sigmatel.c.patch b/review-2.6.28/alsa-hda-don-t-reset-hp-pinctl-in-patch_sigmatel.c.patch similarity index 100% rename from queue-2.6.28/alsa-hda-don-t-reset-hp-pinctl-in-patch_sigmatel.c.patch rename to review-2.6.28/alsa-hda-don-t-reset-hp-pinctl-in-patch_sigmatel.c.patch diff --git a/queue-2.6.28/alsa-hda-fix-hp-dv5-mic-input.patch b/review-2.6.28/alsa-hda-fix-hp-dv5-mic-input.patch similarity index 100% rename from queue-2.6.28/alsa-hda-fix-hp-dv5-mic-input.patch rename to review-2.6.28/alsa-hda-fix-hp-dv5-mic-input.patch diff --git a/queue-2.6.28/alsa-hda-make-laptop-eapd-model-back-for-ad1986a.patch b/review-2.6.28/alsa-hda-make-laptop-eapd-model-back-for-ad1986a.patch similarity index 100% rename from queue-2.6.28/alsa-hda-make-laptop-eapd-model-back-for-ad1986a.patch rename to review-2.6.28/alsa-hda-make-laptop-eapd-model-back-for-ad1986a.patch diff --git a/queue-2.6.28/dell_rbu-use-scnprintf-instead-of-less-secure-sprintf.patch b/review-2.6.28/dell_rbu-use-scnprintf-instead-of-less-secure-sprintf.patch similarity index 100% rename from queue-2.6.28/dell_rbu-use-scnprintf-instead-of-less-secure-sprintf.patch rename to review-2.6.28/dell_rbu-use-scnprintf-instead-of-less-secure-sprintf.patch diff --git a/queue-2.6.28/drivers-net-irda-irda-usb.c-fix-buffer-overflow.patch b/review-2.6.28/drivers-net-irda-irda-usb.c-fix-buffer-overflow.patch similarity index 100% rename from queue-2.6.28/drivers-net-irda-irda-usb.c-fix-buffer-overflow.patch rename to review-2.6.28/drivers-net-irda-irda-usb.c-fix-buffer-overflow.patch diff --git a/queue-2.6.28/fs-remove-wb_sync_hold.patch b/review-2.6.28/fs-remove-wb_sync_hold.patch similarity index 100% rename from queue-2.6.28/fs-remove-wb_sync_hold.patch rename to review-2.6.28/fs-remove-wb_sync_hold.patch diff --git a/queue-2.6.28/fs-sync_sb_inodes-fix.patch b/review-2.6.28/fs-sync_sb_inodes-fix.patch similarity index 100% rename from queue-2.6.28/fs-sync_sb_inodes-fix.patch rename to review-2.6.28/fs-sync_sb_inodes-fix.patch diff --git a/queue-2.6.28/fs-sys_sync-fix.patch b/review-2.6.28/fs-sys_sync-fix.patch similarity index 100% rename from queue-2.6.28/fs-sys_sync-fix.patch rename to review-2.6.28/fs-sys_sync-fix.patch diff --git a/queue-2.6.28/hwmon-fix-config_dmi-n-fallback-to-probe.patch b/review-2.6.28/hwmon-fix-config_dmi-n-fallback-to-probe.patch similarity index 100% rename from queue-2.6.28/hwmon-fix-config_dmi-n-fallback-to-probe.patch rename to review-2.6.28/hwmon-fix-config_dmi-n-fallback-to-probe.patch diff --git a/queue-2.6.28/ia64-turn-on-config_have_unstable_clock.patch b/review-2.6.28/ia64-turn-on-config_have_unstable_clock.patch similarity index 100% rename from queue-2.6.28/ia64-turn-on-config_have_unstable_clock.patch rename to review-2.6.28/ia64-turn-on-config_have_unstable_clock.patch diff --git a/queue-2.6.28/ipv6-fix-fib6_dump_table-walker-leak.patch b/review-2.6.28/ipv6-fix-fib6_dump_table-walker-leak.patch similarity index 100% rename from queue-2.6.28/ipv6-fix-fib6_dump_table-walker-leak.patch rename to review-2.6.28/ipv6-fix-fib6_dump_table-walker-leak.patch diff --git a/queue-2.6.28/lib-idr.c-use-kmem_cache_zalloc-for-the-idr_layer-cache.patch b/review-2.6.28/lib-idr.c-use-kmem_cache_zalloc-for-the-idr_layer-cache.patch similarity index 100% rename from queue-2.6.28/lib-idr.c-use-kmem_cache_zalloc-for-the-idr_layer-cache.patch rename to review-2.6.28/lib-idr.c-use-kmem_cache_zalloc-for-the-idr_layer-cache.patch diff --git a/review-2.6.28/mbox b/review-2.6.28/mbox new file mode 100644 index 00000000000..dc79a1dd43a --- /dev/null +++ b/review-2.6.28/mbox @@ -0,0 +1,5029 @@ +From gregkh@mini.kroah.org Thu Jan 22 17:07:53 2009 +Message-Id: <20090123010753.087634007@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:06:52 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Shaohua Li , + Jesse Barnes +Subject: [patch 01/46] PCI: keep ASPM link state consistent throughout PCIe hierarchy +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=pci-keep-aspm-link-state-consistent-throughout-pcie-hierarchy.patch +Content-Length: 7400 +Lines: 238 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Shaohua Li + +commit 46bbdfa44cfc0d352148a0dc33ba9f6db02ccdf0 upstream. + +In a PCIe hierarchy with a switch present, if the link state of an +endpoint device is changed, we must check the whole hierarchy from the +endpoint device to root port, and for each link in the hierarchy, the new +link state should be configured. Previously, the implementation checked +the state but forgot to configure the links between root port to switch. +Fixes Novell bz #448987. + +Signed-off-by: Shaohua Li +Tested-by: Andrew Patterson +Signed-off-by: Jesse Barnes +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/pci/pcie/aspm.c | 127 ++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 107 insertions(+), 20 deletions(-) + +--- a/drivers/pci/pcie/aspm.c ++++ b/drivers/pci/pcie/aspm.c +@@ -33,6 +33,11 @@ struct endpoint_state { + struct pcie_link_state { + struct list_head sibiling; + struct pci_dev *pdev; ++ bool downstream_has_switch; ++ ++ struct pcie_link_state *parent; ++ struct list_head children; ++ struct list_head link; + + /* ASPM state */ + unsigned int support_state; +@@ -125,7 +130,7 @@ static void pcie_set_clock_pm(struct pci + link_state->clk_pm_enabled = !!enable; + } + +-static void pcie_check_clock_pm(struct pci_dev *pdev) ++static void pcie_check_clock_pm(struct pci_dev *pdev, int blacklist) + { + int pos; + u32 reg32; +@@ -149,10 +154,26 @@ static void pcie_check_clock_pm(struct p + if (!(reg16 & PCI_EXP_LNKCTL_CLKREQ_EN)) + enabled = 0; + } +- link_state->clk_pm_capable = capable; + link_state->clk_pm_enabled = enabled; + link_state->bios_clk_state = enabled; +- pcie_set_clock_pm(pdev, policy_to_clkpm_state(pdev)); ++ if (!blacklist) { ++ link_state->clk_pm_capable = capable; ++ pcie_set_clock_pm(pdev, policy_to_clkpm_state(pdev)); ++ } else { ++ link_state->clk_pm_capable = 0; ++ pcie_set_clock_pm(pdev, 0); ++ } ++} ++ ++static bool pcie_aspm_downstream_has_switch(struct pci_dev *pdev) ++{ ++ struct pci_dev *child_dev; ++ ++ list_for_each_entry(child_dev, &pdev->subordinate->devices, bus_list) { ++ if (child_dev->pcie_type == PCI_EXP_TYPE_UPSTREAM) ++ return true; ++ } ++ return false; + } + + /* +@@ -419,9 +440,9 @@ static unsigned int pcie_aspm_check_stat + { + struct pci_dev *child_dev; + +- /* If no child, disable the link */ ++ /* If no child, ignore the link */ + if (list_empty(&pdev->subordinate->devices)) +- return 0; ++ return state; + list_for_each_entry(child_dev, &pdev->subordinate->devices, bus_list) { + if (child_dev->pcie_type == PCI_EXP_TYPE_PCI_BRIDGE) { + /* +@@ -462,6 +483,9 @@ static void __pcie_aspm_config_link(stru + int valid = 1; + struct pcie_link_state *link_state = pdev->link_state; + ++ /* If no child, disable the link */ ++ if (list_empty(&pdev->subordinate->devices)) ++ state = 0; + /* + * if the downstream component has pci bridge function, don't do ASPM + * now +@@ -493,20 +517,52 @@ static void __pcie_aspm_config_link(stru + link_state->enabled_state = state; + } + ++static struct pcie_link_state *get_root_port_link(struct pcie_link_state *link) ++{ ++ struct pcie_link_state *root_port_link = link; ++ while (root_port_link->parent) ++ root_port_link = root_port_link->parent; ++ return root_port_link; ++} ++ ++/* check the whole hierarchy, and configure each link in the hierarchy */ + static void __pcie_aspm_configure_link_state(struct pci_dev *pdev, + unsigned int state) + { + struct pcie_link_state *link_state = pdev->link_state; ++ struct pcie_link_state *root_port_link = get_root_port_link(link_state); ++ struct pcie_link_state *leaf; + +- if (link_state->support_state == 0) +- return; + state &= PCIE_LINK_STATE_L0S|PCIE_LINK_STATE_L1; + +- /* state 0 means disabling aspm */ +- state = pcie_aspm_check_state(pdev, state); ++ /* check all links who have specific root port link */ ++ list_for_each_entry(leaf, &link_list, sibiling) { ++ if (!list_empty(&leaf->children) || ++ get_root_port_link(leaf) != root_port_link) ++ continue; ++ state = pcie_aspm_check_state(leaf->pdev, state); ++ } ++ /* check root port link too in case it hasn't children */ ++ state = pcie_aspm_check_state(root_port_link->pdev, state); ++ + if (link_state->enabled_state == state) + return; +- __pcie_aspm_config_link(pdev, state); ++ ++ /* ++ * we must change the hierarchy. See comments in ++ * __pcie_aspm_config_link for the order ++ **/ ++ if (state & PCIE_LINK_STATE_L1) { ++ list_for_each_entry(leaf, &link_list, sibiling) { ++ if (get_root_port_link(leaf) == root_port_link) ++ __pcie_aspm_config_link(leaf->pdev, state); ++ } ++ } else { ++ list_for_each_entry_reverse(leaf, &link_list, sibiling) { ++ if (get_root_port_link(leaf) == root_port_link) ++ __pcie_aspm_config_link(leaf->pdev, state); ++ } ++ } + } + + /* +@@ -570,6 +626,7 @@ void pcie_aspm_init_link_state(struct pc + unsigned int state; + struct pcie_link_state *link_state; + int error = 0; ++ int blacklist; + + if (aspm_disabled || !pdev->is_pcie || pdev->link_state) + return; +@@ -580,29 +637,58 @@ void pcie_aspm_init_link_state(struct pc + if (list_empty(&pdev->subordinate->devices)) + goto out; + +- if (pcie_aspm_sanity_check(pdev)) +- goto out; ++ blacklist = !!pcie_aspm_sanity_check(pdev); + + mutex_lock(&aspm_lock); + + link_state = kzalloc(sizeof(*link_state), GFP_KERNEL); + if (!link_state) + goto unlock_out; +- pdev->link_state = link_state; + +- pcie_aspm_configure_common_clock(pdev); +- +- pcie_aspm_cap_init(pdev); ++ link_state->downstream_has_switch = pcie_aspm_downstream_has_switch(pdev); ++ INIT_LIST_HEAD(&link_state->children); ++ INIT_LIST_HEAD(&link_state->link); ++ if (pdev->bus->self) {/* this is a switch */ ++ struct pcie_link_state *parent_link_state; ++ ++ parent_link_state = pdev->bus->parent->self->link_state; ++ if (!parent_link_state) { ++ kfree(link_state); ++ goto unlock_out; ++ } ++ list_add(&link_state->link, &parent_link_state->children); ++ link_state->parent = parent_link_state; ++ } + +- /* config link state to avoid BIOS error */ +- state = pcie_aspm_check_state(pdev, policy_to_aspm_state(pdev)); +- __pcie_aspm_config_link(pdev, state); ++ pdev->link_state = link_state; + +- pcie_check_clock_pm(pdev); ++ if (!blacklist) { ++ pcie_aspm_configure_common_clock(pdev); ++ pcie_aspm_cap_init(pdev); ++ } else { ++ link_state->enabled_state = PCIE_LINK_STATE_L0S|PCIE_LINK_STATE_L1; ++ link_state->bios_aspm_state = 0; ++ /* Set support state to 0, so we will disable ASPM later */ ++ link_state->support_state = 0; ++ } + + link_state->pdev = pdev; + list_add(&link_state->sibiling, &link_list); + ++ if (link_state->downstream_has_switch) { ++ /* ++ * If link has switch, delay the link config. The leaf link ++ * initialization will config the whole hierarchy. but we must ++ * make sure BIOS doesn't set unsupported link state ++ **/ ++ state = pcie_aspm_check_state(pdev, link_state->bios_aspm_state); ++ __pcie_aspm_config_link(pdev, state); ++ } else ++ __pcie_aspm_configure_link_state(pdev, ++ policy_to_aspm_state(pdev)); ++ ++ pcie_check_clock_pm(pdev, blacklist); ++ + unlock_out: + if (error) + free_link_state(pdev); +@@ -635,6 +721,7 @@ void pcie_aspm_exit_link_state(struct pc + /* All functions are removed, so just disable ASPM for the link */ + __pcie_aspm_config_one_dev(parent, 0); + list_del(&link_state->sibiling); ++ list_del(&link_state->link); + /* Clock PM is for endpoint device */ + + free_link_state(parent); + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:53 2009 +Message-Id: <20090123010753.233655639@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:06:53 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + David Howells , + James Morris , + Vegard Nossum +Subject: [patch 02/46] security: introduce missing kfree +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=security-introduce-missing-kfree.patch +Content-Length: 668 +Lines: 27 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Vegard Nossum + +commit 0d54ee1c7850a954026deec4cd4885f331da35cc upstream. + +Plug this leak. + +Acked-by: David Howells +Cc: James Morris +Signed-off-by: Vegard Nossum +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + security/keys/keyctl.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/security/keys/keyctl.c ++++ b/security/keys/keyctl.c +@@ -270,6 +270,7 @@ long keyctl_join_session_keyring(const c + + /* join the session */ + ret = join_session_keyring(name); ++ kfree(name); + + error: + return ret; + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:53 2009 +Message-Id: <20090123010753.350520422@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:06:54 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Stefan Lippers-Hollmann , + "John W. Linville" +Subject: [patch 03/46] rt2x00: add USB ID for the Linksys WUSB200. +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=rt2x00-add-usb-id-for-the-linksys-wusb200.patch +Content-Length: 938 +Lines: 26 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Stefan Lippers-Hollmann + +commit 3be36ae223271f9c2cfbe7406846c8fdcd2f50c3 upstream. + +add USB ID for the Linksys WUSB200 Wireless-G Business USB Adapter to +rt73usb. + +Signed-off-by: Stefan Lippers-Hollmann +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/rt2x00/rt73usb.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/wireless/rt2x00/rt73usb.c ++++ b/drivers/net/wireless/rt2x00/rt73usb.c +@@ -2434,6 +2434,7 @@ static struct usb_device_id rt73usb_devi + /* Linksys */ + { USB_DEVICE(0x13b1, 0x0020), USB_DEVICE_DATA(&rt73usb_ops) }, + { USB_DEVICE(0x13b1, 0x0023), USB_DEVICE_DATA(&rt73usb_ops) }, ++ { USB_DEVICE(0x13b1, 0x0028), USB_DEVICE_DATA(&rt73usb_ops) }, + /* MSI */ + { USB_DEVICE(0x0db0, 0x6877), USB_DEVICE_DATA(&rt73usb_ops) }, + { USB_DEVICE(0x0db0, 0x6874), USB_DEVICE_DATA(&rt73usb_ops) }, + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:53 2009 +Message-Id: <20090123010753.493849044@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:06:55 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Michiel , + Larry Finger , + "John W. Linville" +Subject: [patch 04/46] p54usb: Add USB ID for Thomson Speedtouch 121g +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=p54usb-add-usb-id-for-thomson-speedtouch-121g.patch +Content-Length: 1018 +Lines: 26 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Michiel + +commit 878e6a432f85690a2c0d88d96f177e54ff1d4a57 upstream. + +Add the USB ID for Thomson Speedtouch 121g to p54usb. + +Signed-off-by: Michiel +Signed-off-by: Larry Finger +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/p54/p54usb.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/wireless/p54/p54usb.c ++++ b/drivers/net/wireless/p54/p54usb.c +@@ -54,6 +54,7 @@ static struct usb_device_id p54u_table[] + {USB_DEVICE(0x050d, 0x7050)}, /* Belkin F5D7050 ver 1000 */ + {USB_DEVICE(0x0572, 0x2000)}, /* Cohiba Proto board */ + {USB_DEVICE(0x0572, 0x2002)}, /* Cohiba Proto board */ ++ {USB_DEVICE(0x06b9, 0x0121)}, /* Thomson SpeedTouch 121g */ + {USB_DEVICE(0x0707, 0xee13)}, /* SMC 2862W-G version 2 */ + {USB_DEVICE(0x083a, 0x4521)}, /* Siemens Gigaset USB Adapter 54 version 2 */ + {USB_DEVICE(0x0846, 0x4240)}, /* Netgear WG111 (v2) */ + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:53 2009 +Message-Id: <20090123010753.643271596@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:06:56 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Stefan Richter , + Nadia Derbey , + "Paul E. McKenney" , + Manfred Spraul , + Kristian Hgsberg , + Pekka Enberg +Subject: [patch 05/46] lib/idr.c: use kmem_cache_zalloc() for the idr_layer cache +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=lib-idr.c-use-kmem_cache_zalloc-for-the-idr_layer-cache.patch +Content-Length: 2452 +Lines: 72 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Andrew Morton + +commit 5b019e99016f3a692ba45bf68fba73a402d7c01a upstream. + +David points out that the idr_remove_all() function returns unused slabs +to the kmem cache, but needs to zero them first or else they will be +uninitialized upon next use. This causes crashes which have been observed +in the firewire subsystem. + +He fixed this by zeroing the object before freeing it in idr_remove_all(). + +But we agree that simply removing the constructor and zeroing the object +at allocation time is simpler than relying upon slab constructor machinery +and might even be faster. + +This problem was introduced by "idr: make idr_remove rcu-safe" (commit +cf481c20c476ad2c0febdace9ce23f5a4db19582), which was first released in +2.6.27. + +There are no known codesites which trigger this bug in 2.6.27 or 2.6.28. +The post-2.6.28 firewire changes are the only known triggerer. + +There might of course be not-yet-discovered triggerers in 2.6.27 and +2.6.28, and there might be out-of-tree triggerers which are added to those +kernel versions. I'll let the -stable guys decide whether they want to +backport this fix. + +Reported-by: David Moore +Cc: Stefan Richter +Cc: Nadia Derbey +Cc: Paul E. McKenney +Cc: Manfred Spraul +Cc: Kristian Hgsberg +Acked-by: Pekka Enberg +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + lib/idr.c | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +--- a/lib/idr.c ++++ b/lib/idr.c +@@ -121,7 +121,7 @@ int idr_pre_get(struct idr *idp, gfp_t g + { + while (idp->id_free_cnt < IDR_FREE_MAX) { + struct idr_layer *new; +- new = kmem_cache_alloc(idr_layer_cache, gfp_mask); ++ new = kmem_cache_zalloc(idr_layer_cache, gfp_mask); + if (new == NULL) + return (0); + move_to_free_list(idp, new); +@@ -623,16 +623,10 @@ void *idr_replace(struct idr *idp, void + } + EXPORT_SYMBOL(idr_replace); + +-static void idr_cache_ctor(void *idr_layer) +-{ +- memset(idr_layer, 0, sizeof(struct idr_layer)); +-} +- + void __init idr_init_cache(void) + { + idr_layer_cache = kmem_cache_create("idr_layer_cache", +- sizeof(struct idr_layer), 0, SLAB_PANIC, +- idr_cache_ctor); ++ sizeof(struct idr_layer), 0, SLAB_PANIC, NULL); + } + + /** + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:53 2009 +Message-Id: <20090123010753.772911676@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:06:57 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Dean Nelson , + Robin Holt +Subject: [patch 06/46] sgi-xp: eliminate false detection of no heartbeat +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=sgi-xp-eliminate-false-detection-of-no-heartbeat.patch +Content-Length: 1576 +Lines: 39 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Dean Nelson + +commit 158bc69effbf96f59c01cdeb20f8d4c184e59f8e upstream. + +After XPC has been up and running on multiple partitions for any length of +time, if XPC on one of the partitions is stopped and restarted (either by +a rmmod/insmod or a system restart), it is possible for the XPCs running +on the other partitions to falsely detect a lack of heartbeat from the XPC +that was just restarted. This false detection will occur if the restarted +XPC comes up within the five-seconds preceding one of the other XPC's +heartbeat check (which occurs once every twenty seconds). + +The detection of no heartbeat results in the detecting XPC deactivating +from the just restarted XPC. The only remedy is to restart one of the +XPCs and hope that one doesn't hit this five-second window on any of the +other partitions. + +Signed-off-by: Dean Nelson +Signed-off-by: Robin Holt +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/misc/sgi-xp/xpc_sn2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/misc/sgi-xp/xpc_sn2.c ++++ b/drivers/misc/sgi-xp/xpc_sn2.c +@@ -904,7 +904,7 @@ xpc_update_partition_info_sn2(struct xpc + dev_dbg(xpc_part, " remote_vars_pa = 0x%016lx\n", + part_sn2->remote_vars_pa); + +- part->last_heartbeat = remote_vars->heartbeat; ++ part->last_heartbeat = remote_vars->heartbeat - 1; + dev_dbg(xpc_part, " last_heartbeat = 0x%016lx\n", + part->last_heartbeat); + + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:54 2009 +Message-Id: <20090123010753.897793261@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:06:58 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Peter Zijlstra , + Mike Galbraith , + Ingo Molnar +Subject: [patch 07/46] sched: fix update_min_vruntime +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=sched-fix-update_min_vruntime.patch +Content-Length: 1895 +Lines: 68 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Peter Zijlstra + +commit e17036dac189dd034c092a91df56aa740db7146d upstream. + +Impact: fix SCHED_IDLE latency problems + +OK, so we have 1 running task A (which is obviously curr and the tree is +equally obviously empty). + +'A' nicely chugs along, doing its thing, carrying min_vruntime along as it +goes. + +Then some whacko speed freak SCHED_IDLE task gets inserted due to SMP +balancing, which is very likely far right, in that case + +update_curr + update_min_vruntime + cfs_rq->rb_leftmost := true (the crazy task sitting in a tree) + vruntime = se->vruntime + +and voila, min_vruntime is waaay right of where it ought to be. + +OK, so why did I write it like that to begin with... + +Aah, yes. + +Say we've just dequeued current + +schedule + deactivate_task(prev) + dequeue_entity + update_min_vruntime + +Then we'll set + + vruntime = cfs_rq->min_vruntime; + +we find !cfs_rq->curr, but do find someone in the tree. Then we _must_ +do vruntime = se->vruntime, because + + vruntime = min_vruntime(vruntime := cfs_rq->min_vruntime, se->vruntime) + +will not advance vruntime, and cause lags the other way around (which we +fixed with that initial patch: 1af5f730fc1bf7c62ec9fb2d307206e18bf40a69 +(sched: more accurate min_vruntime accounting). + +Signed-off-by: Peter Zijlstra +Tested-by: Mike Galbraith +Acked-by: Mike Galbraith +Signed-off-by: Ingo Molnar +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/sched_fair.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/kernel/sched_fair.c ++++ b/kernel/sched_fair.c +@@ -283,7 +283,7 @@ static void update_min_vruntime(struct c + struct sched_entity, + run_node); + +- if (vruntime == cfs_rq->min_vruntime) ++ if (!cfs_rq->curr) + vruntime = se->vruntime; + else + vruntime = min_vruntime(vruntime, se->vruntime); + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:54 2009 +Message-Id: <20090123010754.053664816@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:06:59 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Tony Luck +Subject: [patch 08/46] IA64: Turn on CONFIG_HAVE_UNSTABLE_CLOCK +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=ia64-turn-on-config_have_unstable_clock.patch +Content-Length: 855 +Lines: 31 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Tony Luck + +commit 0773a6cf673316440999752e23f8c3d4f85e48b9 upstream. + +sched_clock() on ia64 is based on ar.itc, so is never +completely synchronized between cpus. On some platforms +(e.g. certain models of SGI Altix) it may be running at +radically different frequencies. + +Based on a patch from Dimitri Sivanich which set this +just for SN2 && GENERIC kernels ... it is needed for +all ia64 machines. + +Signed-off-by: Tony Luck +Signed-off-by: Greg Kroah-Hartman + +--- + arch/ia64/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/ia64/Kconfig ++++ b/arch/ia64/Kconfig +@@ -17,6 +17,7 @@ config IA64 + select ACPI if (!IA64_HP_SIM) + select PM if (!IA64_HP_SIM) + select ARCH_SUPPORTS_MSI ++ select HAVE_UNSTABLE_SCHED_CLOCK + select HAVE_IDE + select HAVE_OPROFILE + select HAVE_KPROBES + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:54 2009 +Message-Id: <20090123010754.158304302@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:00 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Clemens Ladisch , + Takashi Iwai +Subject: [patch 09/46] sound: virtuoso: do not overwrite EEPROM on Xonar D2/D2X +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=sound-virtuoso-do-not-overwrite-eeprom-on-xonar-d2-d2x.patch +Content-Length: 3087 +Lines: 81 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Clemens Ladisch + +commit 7e86c0e6850504ec9516b953f316a47277825e33 upstream. + +On the Asus Xonar D2 and D2X models, the SPI chip select signal for the +fourth DAC shares its pin with the serial clock for the EEPROM that +contains the PCI subdevice ID values. It appears that when DAC +registers are written and some other unknown conditions occur (probably +noise on the EEPROM's chip select line), the EEPROM gets overwritten +with garbage, which makes it impossible to properly detect the card +later. + +Therefore, we better avoid DAC register writes and make sure that the +driver works with the DAC's registers' default values. Consequently, +the sample format is now I2S instead of left-justified (no user-visible +change), and the DAC's volume/mute registers cannot be used anymore +(volume changes are now done by the software volume plugin). + +Signed-off-by: Clemens Ladisch +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/oxygen/virtuoso.c | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +--- a/sound/pci/oxygen/virtuoso.c ++++ b/sound/pci/oxygen/virtuoso.c +@@ -26,7 +26,7 @@ + * SPI 0 -> 1st PCM1796 (front) + * SPI 1 -> 2nd PCM1796 (surround) + * SPI 2 -> 3rd PCM1796 (center/LFE) +- * SPI 4 -> 4th PCM1796 (back) ++ * SPI 4 -> 4th PCM1796 (back) and EEPROM self-destruct (do not use!) + * + * GPIO 2 -> M0 of CS5381 + * GPIO 3 -> M1 of CS5381 +@@ -207,6 +207,12 @@ static void xonar_gpio_changed(struct ox + static inline void pcm1796_write_spi(struct oxygen *chip, unsigned int codec, + u8 reg, u8 value) + { ++ /* ++ * We don't want to do writes on SPI 4 because the EEPROM, which shares ++ * the same pin, might get confused and broken. We'd better take care ++ * that the driver works with the default register values ... ++ */ ++#if 0 + /* maps ALSA channel pair number to SPI output */ + static const u8 codec_map[4] = { + 0, 1, 2, 4 +@@ -217,6 +223,7 @@ static inline void pcm1796_write_spi(str + (codec_map[codec] << OXYGEN_SPI_CODEC_SHIFT) | + OXYGEN_SPI_CEN_LATCH_CLOCK_HI, + (reg << 8) | value); ++#endif + } + + static inline void pcm1796_write_i2c(struct oxygen *chip, unsigned int codec, +@@ -750,6 +757,9 @@ static const DECLARE_TLV_DB_SCALE(cs4362 + + static int xonar_d2_control_filter(struct snd_kcontrol_new *template) + { ++ if (!strncmp(template->name, "Master Playback ", 16)) ++ /* disable volume/mute because they would require SPI writes */ ++ return 1; + if (!strncmp(template->name, "CD Capture ", 11)) + /* CD in is actually connected to the video in pin */ + template->private_value ^= AC97_CD ^ AC97_VIDEO; +@@ -840,9 +850,8 @@ static const struct oxygen_model model_x + .dac_volume_min = 0x0f, + .dac_volume_max = 0xff, + .misc_flags = OXYGEN_MISC_MIDI, +- .function_flags = OXYGEN_FUNCTION_SPI | +- OXYGEN_FUNCTION_ENABLE_SPI_4_5, +- .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, ++ .function_flags = OXYGEN_FUNCTION_SPI, ++ .dac_i2s_format = OXYGEN_I2S_FORMAT_I2S, + .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, + }; + + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:54 2009 +Message-Id: <20090123010754.278589073@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:01 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Takashi Iwai +Subject: [patch 10/46] ALSA: hda - Add quirk for another HP dv5 +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=alsa-hda-add-quirk-for-another-hp-dv5.patch +Content-Length: 860 +Lines: 27 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Giuseppe Bilotta + +commit dafb70ce1026d4d6ef1b16ad6996c9589bb11cce upstream. + +Add the model=hp-m4 quirk for another HP dv5 (103c:3603) +Reference: kernel bug#12440 + http://bugzilla.kernel.org/show_bug.cgi?id=12440 + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_sigmatel.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/pci/hda/patch_sigmatel.c ++++ b/sound/pci/hda/patch_sigmatel.c +@@ -1722,6 +1722,8 @@ static struct snd_pci_quirk stac92hd71bx + "HP dv7", STAC_HP_M4), + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30fc, + "HP dv7", STAC_HP_M4), ++ SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3603, ++ "HP dv5", STAC_HP_M4), + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361a, + "unknown HP", STAC_HP_M4), + SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233, + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:54 2009 +Message-Id: <20090123010754.408134238@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:02 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Takashi Iwai +Subject: [patch 11/46] ALSA: hda - Fix HP dv5 mic input +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=alsa-hda-fix-hp-dv5-mic-input.patch +Content-Length: 1491 +Lines: 52 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Takashi Iwai + +commit 1b0652eb588e57c3ab230e0291e7da99c7e665e0 upstream. + +Fix HP dv5 (103c:3603) built-in mic input. + +Reference: kernel bug 12440 + http://bugzilla.kernel.org/show_bug.cgi?id=12440 + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_sigmatel.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/sound/pci/hda/patch_sigmatel.c ++++ b/sound/pci/hda/patch_sigmatel.c +@@ -89,6 +89,7 @@ enum { + STAC_DELL_M4_2, + STAC_DELL_M4_3, + STAC_HP_M4, ++ STAC_HP_DV5, + STAC_92HD71BXX_MODELS + }; + +@@ -1702,6 +1703,7 @@ static unsigned int *stac92hd71bxx_brd_t + [STAC_DELL_M4_2] = dell_m4_2_pin_configs, + [STAC_DELL_M4_3] = dell_m4_3_pin_configs, + [STAC_HP_M4] = NULL, ++ [STAC_HP_DV5] = NULL, + }; + + static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = { +@@ -1710,6 +1712,7 @@ static const char *stac92hd71bxx_models[ + [STAC_DELL_M4_2] = "dell-m4-2", + [STAC_DELL_M4_3] = "dell-m4-3", + [STAC_HP_M4] = "hp-m4", ++ [STAC_HP_DV5] = "hp-dv5", + }; + + static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = { +@@ -1723,7 +1726,7 @@ static struct snd_pci_quirk stac92hd71bx + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30fc, + "HP dv7", STAC_HP_M4), + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3603, +- "HP dv5", STAC_HP_M4), ++ "HP dv5", STAC_HP_DV5), + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361a, + "unknown HP", STAC_HP_M4), + SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233, + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:54 2009 +Message-Id: <20090123010754.534899861@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:03 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Luke Yelavich , + Takashi Iwai +Subject: [patch 12/46] ALSA: hda - Add automatic model setting for Samsung Q45 +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=alsa-hda-add-automatic-model-setting-for-samsung-q45.patch +Content-Length: 1060 +Lines: 28 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Luke Yelavich + +commit 3e420e78ece6f9d2accc1568e80dfd0501e13df1 upstream. + +Have the Samsung Q45 (144d:c510) select ALC262_HIPPO by default + +Reference: Ubuntu bug 200210 + http://launchpad.net/bugs/200210 + +Signed-off-by: Luke Yelavich +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -10473,6 +10473,7 @@ static struct snd_pci_quirk alc262_cfg_t + SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FUJITSU), + SND_PCI_QUIRK(0x144d, 0xc032, "Samsung Q1 Ultra", ALC262_ULTRA), + SND_PCI_QUIRK(0x144d, 0xc039, "Samsung Q1U EL", ALC262_ULTRA), ++ SND_PCI_QUIRK(0x144d, 0xc510, "Samsung Q45", ALC262_HIPPO), + SND_PCI_QUIRK(0x17aa, 0x384e, "Lenovo 3000 y410", ALC262_LENOVO_3000), + SND_PCI_QUIRK(0x17ff, 0x0560, "Benq ED8", ALC262_BENQ_ED8), + SND_PCI_QUIRK(0x17ff, 0x058d, "Benq T31-16", ALC262_BENQ_T31), + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:54 2009 +Message-Id: <20090123010754.682731289@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:04 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Takashi Iwai +Subject: [patch 13/46] ALSA: hda - Dont reset HP pinctl in patch_sigmatel.c +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=alsa-hda-don-t-reset-hp-pinctl-in-patch_sigmatel.c.patch +Content-Length: 1329 +Lines: 40 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Takashi Iwai + +commit 8317e0b0c2234f5f1f5d54804e4093d11bc0dffa upstream. + +Resetting HP pinctl at the unplugged state may cause a sort of regression +on some devices because of their wrong pin configuration. + +A simple workaround is to disable the pin reset. This is ugly and may be +not good from the power-saving POV (if any), but damn simple. + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_sigmatel.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +--- a/sound/pci/hda/patch_sigmatel.c ++++ b/sound/pci/hda/patch_sigmatel.c +@@ -3985,8 +3985,19 @@ static void stac92xx_hp_detect(struct hd + continue; + if (presence) + stac92xx_set_pinctl(codec, cfg->hp_pins[i], val); ++#if 0 /* FIXME */ ++/* Resetting the pinctl like below may lead to (a sort of) regressions ++ * on some devices since they use the HP pin actually for line/speaker ++ * outs although the default pin config shows a different pin (that is ++ * wrong and useless). ++ * ++ * So, it's basically a problem of default pin configs, likely a BIOS issue. ++ * But, disabling the code below just works around it, and I'm too tired of ++ * bug reports with such devices... ++ */ + else + stac92xx_reset_pinctl(codec, cfg->hp_pins[i], val); ++#endif /* FIXME */ + } + } + + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:54 2009 +Message-Id: <20090123010754.829462019@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:05 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Takashi Iwai , + Daniel Drake +Subject: [patch 14/46] ALSA: hda - make laptop-eapd model back for AD1986A +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=alsa-hda-make-laptop-eapd-model-back-for-ad1986a.patch +Content-Length: 5160 +Lines: 125 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Takashi Iwai + +commit 1725b82a6e2721612a3572d0336f51f1f1c3cf54 upstream. + +The changes specific for Samsung laptops seem unapplicable to other +hardware models like ASUS. The mic inputs are lost on such hardware +by the change 5d5d5f43f1b835c375de9bd270cce030d16e2871. + +This patch adds back the old laptop-eapd model, and create a new +model "samsung" for the new one specific to Samsung laptops with +automatic mic selection feature. + +Reference: kernel bugzilla #12070 + http://bugzilla.kernel.org/show_bug.cgi?id=12070 + +Signed-off-by: Takashi Iwai +Cc: Daniel Drake +Signed-off-by: Greg Kroah-Hartman + +--- + Documentation/sound/alsa/ALSA-Configuration.txt | 3 - + sound/pci/hda/patch_analog.c | 49 ++++++++++++++++++++++-- + 2 files changed, 48 insertions(+), 4 deletions(-) + +--- a/Documentation/sound/alsa/ALSA-Configuration.txt ++++ b/Documentation/sound/alsa/ALSA-Configuration.txt +@@ -979,9 +979,10 @@ Prior to version 0.9.0rc4 options had a + 6stack 6-jack, separate surrounds (default) + 3stack 3-stack, shared surrounds + laptop 2-channel only (FSC V2060, Samsung M50) +- laptop-eapd 2-channel with EAPD (Samsung R65, ASUS A6J) ++ laptop-eapd 2-channel with EAPD (ASUS A6J) + laptop-automute 2-channel with EAPD and HP-automute (Lenovo N100) + ultra 2-channel with EAPD (Samsung Ultra tablet PC) ++ samsung 2-channel with EAPD (Samsung R65) + + AD1988/AD1988B/AD1989A/AD1989B + 6stack 6-jack +--- a/sound/pci/hda/patch_analog.c ++++ b/sound/pci/hda/patch_analog.c +@@ -629,6 +629,36 @@ static struct snd_kcontrol_new ad1986a_l + HDA_BIND_SW("Master Playback Switch", &ad1986a_laptop_master_sw), + HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT), + HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT), ++ HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0, HDA_OUTPUT), ++ HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x17, 0, HDA_OUTPUT), ++ HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT), ++ HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT), ++ HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT), ++ HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT), ++ HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT), ++ { ++ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, ++ .name = "Capture Source", ++ .info = ad198x_mux_enum_info, ++ .get = ad198x_mux_enum_get, ++ .put = ad198x_mux_enum_put, ++ }, ++ { ++ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, ++ .name = "External Amplifier", ++ .info = ad198x_eapd_info, ++ .get = ad198x_eapd_get, ++ .put = ad198x_eapd_put, ++ .private_value = 0x1b | (1 << 8), /* port-D, inversed */ ++ }, ++ { } /* end */ ++}; ++ ++static struct snd_kcontrol_new ad1986a_samsung_mixers[] = { ++ HDA_BIND_VOL("Master Playback Volume", &ad1986a_laptop_master_vol), ++ HDA_BIND_SW("Master Playback Switch", &ad1986a_laptop_master_sw), ++ HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT), ++ HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT), + HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT), + HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT), + HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT), +@@ -917,6 +947,7 @@ enum { + AD1986A_LAPTOP_EAPD, + AD1986A_LAPTOP_AUTOMUTE, + AD1986A_ULTRA, ++ AD1986A_SAMSUNG, + AD1986A_MODELS + }; + +@@ -927,6 +958,7 @@ static const char *ad1986a_models[AD1986 + [AD1986A_LAPTOP_EAPD] = "laptop-eapd", + [AD1986A_LAPTOP_AUTOMUTE] = "laptop-automute", + [AD1986A_ULTRA] = "ultra", ++ [AD1986A_SAMSUNG] = "samsung", + }; + + static struct snd_pci_quirk ad1986a_cfg_tbl[] = { +@@ -949,9 +981,9 @@ static struct snd_pci_quirk ad1986a_cfg_ + SND_PCI_QUIRK(0x1179, 0xff40, "Toshiba", AD1986A_LAPTOP_EAPD), + SND_PCI_QUIRK(0x144d, 0xb03c, "Samsung R55", AD1986A_3STACK), + SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_LAPTOP), +- SND_PCI_QUIRK(0x144d, 0xc023, "Samsung X60", AD1986A_LAPTOP_EAPD), +- SND_PCI_QUIRK(0x144d, 0xc024, "Samsung R65", AD1986A_LAPTOP_EAPD), +- SND_PCI_QUIRK(0x144d, 0xc026, "Samsung X11", AD1986A_LAPTOP_EAPD), ++ SND_PCI_QUIRK(0x144d, 0xc023, "Samsung X60", AD1986A_SAMSUNG), ++ SND_PCI_QUIRK(0x144d, 0xc024, "Samsung R65", AD1986A_SAMSUNG), ++ SND_PCI_QUIRK(0x144d, 0xc026, "Samsung X11", AD1986A_SAMSUNG), + SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_ULTRA), + SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK), + SND_PCI_QUIRK(0x17aa, 0x1011, "Lenovo M55", AD1986A_LAPTOP), +@@ -1033,6 +1065,17 @@ static int patch_ad1986a(struct hda_code + break; + case AD1986A_LAPTOP_EAPD: + spec->mixers[0] = ad1986a_laptop_eapd_mixers; ++ spec->num_init_verbs = 2; ++ spec->init_verbs[1] = ad1986a_eapd_init_verbs; ++ spec->multiout.max_channels = 2; ++ spec->multiout.num_dacs = 1; ++ spec->multiout.dac_nids = ad1986a_laptop_dac_nids; ++ if (!is_jack_available(codec, 0x25)) ++ spec->multiout.dig_out_nid = 0; ++ spec->input_mux = &ad1986a_laptop_eapd_capture_source; ++ break; ++ case AD1986A_SAMSUNG: ++ spec->mixers[0] = ad1986a_samsung_mixers; + spec->num_init_verbs = 3; + spec->init_verbs[1] = ad1986a_eapd_init_verbs; + spec->init_verbs[2] = ad1986a_automic_verbs; + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:55 2009 +Message-Id: <20090123010754.988948142@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:06 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + "David S. Miller" +Subject: [patch 15/46] drivers/net/irda/irda-usb.c: fix buffer overflow +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=drivers-net-irda-irda-usb.c-fix-buffer-overflow.patch +Content-Length: 939 +Lines: 30 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Jos-Vicente Gilabert + +commit 2950e952920811be465ec95c6b56f03dc66a05c0 upstream. + +Taken from http://bugzilla.kernel.org/show_bug.cgi?id=12397 + +We're doing an sprintf of an 11-char string into an 11-char buffer. +Whoops. It breaks firmware uploading. + +Reported-by: Jos-Vicente Gilabert +Signed-off-by: Andrew Morton +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/irda/irda-usb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/irda/irda-usb.c ++++ b/drivers/net/irda/irda-usb.c +@@ -1075,7 +1075,7 @@ static int stir421x_patch_device(struct + { + unsigned int i; + int ret; +- char stir421x_fw_name[11]; ++ char stir421x_fw_name[12]; + const struct firmware *fw; + const unsigned char *fw_version_ptr; /* pointer to version string */ + unsigned long fw_version = 0; + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:55 2009 +Message-Id: <20090123010755.123153117@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:07 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org, + Greg KH +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + USB Storage list , + Alan Stern +Subject: [patch 16/46] usb-storage: add last-sector hacks +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=usb-storage-add-last-sector-hacks.patch +Content-Length: 10724 +Lines: 309 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Alan Stern + +commit 25ff1c316f6a763f1eefe7f8984b2d8c03888432 upstream. + +This patch (as1189c) adds some hacks to usb-storage for dealing with +the growing problems involving bad capacity values and last-sector +accesses: + + A new flag, US_FL_CAPACITY_OK, is created to indicate that + the device is known to report its capacity correctly. An + unusual_devs entry for Linux's own File-backed Storage Gadget + is added with this flag set, since g_file_storage always + reports the correct capacity and since the capacity need + not be even (it is determined by the size of the backing + file). + + An entry in unusual_devs.h which has only the CAPACITY_OK + flag set shouldn't prejudice libusual, since the device will + work perfectly well with either usb-storage or ub. So a + new macro, COMPLIANT_DEV, is added to let libusual know + about these entries. + + When a last-sector access fails three times in a row and + neither the FIX_CAPACITY nor the CAPACITY_OK flag is set, + we assume the last-sector bug is present. We replace the + existing status and sense data with values that will cause + the SCSI core to fail the access immediately rather than + retry indefinitely. This should fix the difficulties + people have been having with Nokia phones. + +This version of the patch differs from the version accepted into the +mainline only in that it does not trigger a WARN() when an +odd-numbered last-sector access succeeds. In a stable kernel series +we don't want to go around spamming users' logs and consoles for no +good reason. + +Signed-off-by: Alan Stern +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/storage/libusual.c | 7 +++ + drivers/usb/storage/scsiglue.c | 8 +++ + drivers/usb/storage/transport.c | 80 +++++++++++++++++++++++++++++++++++++ + drivers/usb/storage/unusual_devs.h | 16 ++++++- + drivers/usb/storage/usb.c | 6 ++ + drivers/usb/storage/usb.h | 4 + + include/linux/usb_usual.h | 5 +- + 7 files changed, 123 insertions(+), 3 deletions(-) + +--- a/drivers/usb/storage/libusual.c ++++ b/drivers/usb/storage/libusual.c +@@ -46,6 +46,12 @@ static int usu_probe_thread(void *arg); + { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin,bcdDeviceMax), \ + .driver_info = (flags)|(USB_US_TYPE_STOR<<24) } + ++#define COMPLIANT_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \ ++ vendorName, productName, useProtocol, useTransport, \ ++ initFunction, flags) \ ++{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \ ++ .driver_info = (flags) } ++ + #define USUAL_DEV(useProto, useTrans, useType) \ + { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, useProto, useTrans), \ + .driver_info = ((useType)<<24) } +@@ -57,6 +63,7 @@ struct usb_device_id storage_usb_ids [] + + #undef USUAL_DEV + #undef UNUSUAL_DEV ++#undef COMPLIANT_DEV + + MODULE_DEVICE_TABLE(usb, storage_usb_ids); + EXPORT_SYMBOL_GPL(storage_usb_ids); +--- a/drivers/usb/storage/scsiglue.c ++++ b/drivers/usb/storage/scsiglue.c +@@ -196,6 +196,14 @@ static int slave_configure(struct scsi_d + * sector in a larger then 1 sector read, since the performance + * impact is negible we set this flag for all USB disks */ + sdev->last_sector_bug = 1; ++ ++ /* Enable last-sector hacks for single-target devices using ++ * the Bulk-only transport, unless we already know the ++ * capacity will be decremented or is correct. */ ++ if (!(us->fflags & (US_FL_FIX_CAPACITY | US_FL_CAPACITY_OK | ++ US_FL_SCM_MULT_TARG)) && ++ us->protocol == US_PR_BULK) ++ us->use_last_sector_hacks = 1; + } else { + + /* Non-disk-type devices don't need to blacklist any pages +--- a/drivers/usb/storage/transport.c ++++ b/drivers/usb/storage/transport.c +@@ -57,6 +57,9 @@ + #include "scsiglue.h" + #include "debug.h" + ++#include ++#include "../../scsi/sd.h" ++ + + /*********************************************************************** + * Data transfer routines +@@ -511,6 +514,80 @@ int usb_stor_bulk_transfer_sg(struct us_ + * Transport routines + ***********************************************************************/ + ++/* There are so many devices that report the capacity incorrectly, ++ * this routine was written to counteract some of the resulting ++ * problems. ++ */ ++static void last_sector_hacks(struct us_data *us, struct scsi_cmnd *srb) ++{ ++ struct gendisk *disk; ++ struct scsi_disk *sdkp; ++ u32 sector; ++ ++ /* To Report "Medium Error: Record Not Found */ ++ static unsigned char record_not_found[18] = { ++ [0] = 0x70, /* current error */ ++ [2] = MEDIUM_ERROR, /* = 0x03 */ ++ [7] = 0x0a, /* additional length */ ++ [12] = 0x14 /* Record Not Found */ ++ }; ++ ++ /* If last-sector problems can't occur, whether because the ++ * capacity was already decremented or because the device is ++ * known to report the correct capacity, then we don't need ++ * to do anything. ++ */ ++ if (!us->use_last_sector_hacks) ++ return; ++ ++ /* Was this command a READ(10) or a WRITE(10)? */ ++ if (srb->cmnd[0] != READ_10 && srb->cmnd[0] != WRITE_10) ++ goto done; ++ ++ /* Did this command access the last sector? */ ++ sector = (srb->cmnd[2] << 24) | (srb->cmnd[3] << 16) | ++ (srb->cmnd[4] << 8) | (srb->cmnd[5]); ++ disk = srb->request->rq_disk; ++ if (!disk) ++ goto done; ++ sdkp = scsi_disk(disk); ++ if (!sdkp) ++ goto done; ++ if (sector + 1 != sdkp->capacity) ++ goto done; ++ ++ if (srb->result == SAM_STAT_GOOD && scsi_get_resid(srb) == 0) { ++ ++ /* The command succeeded. We know this device doesn't ++ * have the last-sector bug, so stop checking it. ++ */ ++ us->use_last_sector_hacks = 0; ++ ++ } else { ++ /* The command failed. Allow up to 3 retries in case this ++ * is some normal sort of failure. After that, assume the ++ * capacity is wrong and we're trying to access the sector ++ * beyond the end. Replace the result code and sense data ++ * with values that will cause the SCSI core to fail the ++ * command immediately, instead of going into an infinite ++ * (or even just a very long) retry loop. ++ */ ++ if (++us->last_sector_retries < 3) ++ return; ++ srb->result = SAM_STAT_CHECK_CONDITION; ++ memcpy(srb->sense_buffer, record_not_found, ++ sizeof(record_not_found)); ++ } ++ ++ done: ++ /* Don't reset the retry counter for TEST UNIT READY commands, ++ * because they get issued after device resets which might be ++ * caused by a failed last-sector access. ++ */ ++ if (srb->cmnd[0] != TEST_UNIT_READY) ++ us->last_sector_retries = 0; ++} ++ + /* Invoke the transport and basic error-handling/recovery methods + * + * This is used by the protocol layers to actually send the message to +@@ -544,6 +621,7 @@ void usb_stor_invoke_transport(struct sc + /* if the transport provided its own sense data, don't auto-sense */ + if (result == USB_STOR_TRANSPORT_NO_SENSE) { + srb->result = SAM_STAT_CHECK_CONDITION; ++ last_sector_hacks(us, srb); + return; + } + +@@ -667,6 +745,7 @@ void usb_stor_invoke_transport(struct sc + scsi_bufflen(srb) - scsi_get_resid(srb) < srb->underflow) + srb->result = (DID_ERROR << 16) | (SUGGEST_RETRY << 24); + ++ last_sector_hacks(us, srb); + return; + + /* Error and abort processing: try to resynchronize with the device +@@ -694,6 +773,7 @@ void usb_stor_invoke_transport(struct sc + us->transport_reset(us); + } + clear_bit(US_FLIDX_RESETTING, &us->dflags); ++ last_sector_hacks(us, srb); + } + + /* Stop the current URB transfer */ +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -27,7 +27,8 @@ + + /* IMPORTANT NOTE: This file must be included in another file which does + * the following thing for it to work: +- * The macro UNUSUAL_DEV() must be defined before this file is included ++ * The UNUSUAL_DEV, COMPLIANT_DEV, and USUAL_DEV macros must be defined ++ * before this file is included. + */ + + /* If you edit this file, please try to keep it sorted first by VendorID, +@@ -46,6 +47,12 @@ + * + */ + ++/* Note: If you add an entry only in order to set the CAPACITY_OK flag, ++ * use the COMPLIANT_DEV macro instead of UNUSUAL_DEV. This is ++ * because such entries mark devices which actually work correctly, ++ * as opposed to devices that do something strangely or wrongly. ++ */ ++ + /* patch submitted by Vivian Bregier + */ + UNUSUAL_DEV( 0x03eb, 0x2002, 0x0100, 0x0100, +@@ -692,6 +699,13 @@ UNUSUAL_DEV( 0x0525, 0xa140, 0x0100, 0x + US_SC_8070, US_PR_DEVICE, NULL, + US_FL_FIX_INQUIRY ), + ++/* Added by Alan Stern */ ++COMPLIANT_DEV(0x0525, 0xa4a5, 0x0000, 0x9999, ++ "Linux", ++ "File-backed Storage Gadget", ++ US_SC_DEVICE, US_PR_DEVICE, NULL, ++ US_FL_CAPACITY_OK ), ++ + /* Yakumo Mega Image 37 + * Submitted by Stephan Fuhrmann */ + UNUSUAL_DEV( 0x052b, 0x1801, 0x0100, 0x0100, +--- a/drivers/usb/storage/usb.c ++++ b/drivers/usb/storage/usb.c +@@ -126,6 +126,8 @@ MODULE_PARM_DESC(delay_use, "seconds to + { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin,bcdDeviceMax), \ + .driver_info = (flags)|(USB_US_TYPE_STOR<<24) } + ++#define COMPLIANT_DEV UNUSUAL_DEV ++ + #define USUAL_DEV(useProto, useTrans, useType) \ + { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, useProto, useTrans), \ + .driver_info = (USB_US_TYPE_STOR<<24) } +@@ -134,6 +136,7 @@ static struct usb_device_id storage_usb_ + + # include "unusual_devs.h" + #undef UNUSUAL_DEV ++#undef COMPLIANT_DEV + #undef USUAL_DEV + /* Terminating entry */ + { } +@@ -164,6 +167,8 @@ MODULE_DEVICE_TABLE (usb, storage_usb_id + .initFunction = init_function, \ + } + ++#define COMPLIANT_DEV UNUSUAL_DEV ++ + #define USUAL_DEV(use_protocol, use_transport, use_type) \ + { \ + .useProtocol = use_protocol, \ +@@ -173,6 +178,7 @@ MODULE_DEVICE_TABLE (usb, storage_usb_id + static struct us_unusual_dev us_unusual_dev_list[] = { + # include "unusual_devs.h" + # undef UNUSUAL_DEV ++# undef COMPLIANT_DEV + # undef USUAL_DEV + + /* Terminating entry */ +--- a/drivers/usb/storage/usb.h ++++ b/drivers/usb/storage/usb.h +@@ -155,6 +155,10 @@ struct us_data { + #ifdef CONFIG_PM + pm_hook suspend_resume_hook; + #endif ++ ++ /* hacks for READ CAPACITY bug handling */ ++ int use_last_sector_hacks; ++ int last_sector_retries; + }; + + /* Convert between us_data and the corresponding Scsi_Host */ +--- a/include/linux/usb_usual.h ++++ b/include/linux/usb_usual.h +@@ -52,8 +52,9 @@ + US_FLAG(MAX_SECTORS_MIN,0x00002000) \ + /* Sets max_sectors to arch min */ \ + US_FLAG(BULK_IGNORE_TAG,0x00004000) \ +- /* Ignore tag mismatch in bulk operations */ +- ++ /* Ignore tag mismatch in bulk operations */ \ ++ US_FLAG(CAPACITY_OK, 0x00010000) \ ++ /* READ CAPACITY response is correct */ + + #define US_FLAG(name, value) US_FL_##name = value , + enum { US_DO_ALL_FLAGS }; + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:55 2009 +Message-Id: <20090123010755.257754303@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:08 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org, + Greg KH +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + USB Storage list , + Alan Stern +Subject: [patch 17/46] usb-storage: set CAPACITY_HEURISTICS flag for bad vendors +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=usb-storage-set-capacity_heuristics-flag-for-bad-vendors.patch +Content-Length: 7924 +Lines: 256 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Alan Stern + +commit a81a81a25d3ecdab777abca87c5ddf484056103d upstream. + +This patch (as1194b) makes usb-storage set the CAPACITY_HEURISTICS flag +for all devices made by Nokia, Nikon, or Motorola. These companies +seem to include the READ CAPACITY bug in all of their devices. + +Since cell phones and digital cameras rely on flash storage, which +always has an even number of sectors, setting CAPACITY_HEURISTICS +shouldn't cause any problems. Not even if the companies wise up and +start making devices without the bug. + +A large number of unusual_devs entries are now unnecessary, so the +patch removes them. + +Signed-off-by: Alan Stern +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/storage/scsiglue.c | 23 +++++ + drivers/usb/storage/unusual_devs.h | 162 ------------------------------------- + 2 files changed, 23 insertions(+), 162 deletions(-) + +--- a/drivers/usb/storage/scsiglue.c ++++ b/drivers/usb/storage/scsiglue.c +@@ -59,6 +59,13 @@ + #include "transport.h" + #include "protocol.h" + ++/* Vendor IDs for companies that seem to include the READ CAPACITY bug ++ * in all their devices ++ */ ++#define VENDOR_ID_NOKIA 0x0421 ++#define VENDOR_ID_NIKON 0x04b0 ++#define VENDOR_ID_MOTOROLA 0x22b8 ++ + /*********************************************************************** + * Host functions + ***********************************************************************/ +@@ -134,6 +141,22 @@ static int slave_configure(struct scsi_d + * settings can't be overridden via the scsi devinfo mechanism. */ + if (sdev->type == TYPE_DISK) { + ++ /* Some vendors seem to put the READ CAPACITY bug into ++ * all their devices -- primarily makers of cell phones ++ * and digital cameras. Since these devices always use ++ * flash media and can be expected to have an even number ++ * of sectors, we will always enable the CAPACITY_HEURISTICS ++ * flag unless told otherwise. */ ++ switch (le16_to_cpu(us->pusb_dev->descriptor.idVendor)) { ++ case VENDOR_ID_NOKIA: ++ case VENDOR_ID_NIKON: ++ case VENDOR_ID_MOTOROLA: ++ if (!(us->fflags & (US_FL_FIX_CAPACITY | ++ US_FL_CAPACITY_OK))) ++ us->fflags |= US_FL_CAPACITY_HEURISTICS; ++ break; ++ } ++ + /* Disk-type devices use MODE SENSE(6) if the protocol + * (SubClass) is Transparent SCSI, otherwise they use + * MODE SENSE(10). */ +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -167,34 +167,6 @@ UNUSUAL_DEV( 0x0421, 0x0019, 0x0592, 0x + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_MAX_SECTORS_64 ), + +-/* Reported by Filip Joelsson */ +-UNUSUAL_DEV( 0x0421, 0x005d, 0x0001, 0x0600, +- "Nokia", +- "Nokia 3110c", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY ), +- +-/* Reported by Ozan Sener */ +-UNUSUAL_DEV( 0x0421, 0x0060, 0x0551, 0x0551, +- "Nokia", +- "3500c", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY ), +- +-/* Reported by CSECSY Laszlo */ +-UNUSUAL_DEV( 0x0421, 0x0063, 0x0001, 0x0601, +- "Nokia", +- "Nokia 3109c", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY ), +- +-/* Patch for Nokia 5310 capacity */ +-UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x0701, +- "Nokia", +- "5310", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY ), +- + /* Reported by Mario Rettig */ + UNUSUAL_DEV( 0x0421, 0x042e, 0x0100, 0x0100, + "Nokia", +@@ -260,42 +232,6 @@ UNUSUAL_DEV( 0x0421, 0x0495, 0x0370, 0x + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_MAX_SECTORS_64 ), + +-/* Reported by Cedric Godin */ +-UNUSUAL_DEV( 0x0421, 0x04b9, 0x0500, 0x0551, +- "Nokia", +- "5300", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY ), +- +-/* Reported by Paulo Fessel */ +-UNUSUAL_DEV( 0x0421, 0x04bd, 0x0000, 0x9999, +- "Nokia", +- "5200", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY ), +- +-/* Reported by Richard Nauber */ +-UNUSUAL_DEV( 0x0421, 0x04fa, 0x0550, 0x0660, +- "Nokia", +- "6300", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY ), +- +-/* Patch for Nokia 5310 capacity */ +-UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x0591, +- "Nokia", +- "5310", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY ), +- +-/* Submitted by Ricky Wong Yung Fei */ +-/* Nokia 7610 Supernova - Too many sectors reported in usb storage mode */ +-UNUSUAL_DEV( 0x0421, 0x00f5, 0x0000, 0x0470, +- "Nokia", +- "7610 Supernova", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY ), +- + /* Reported by Olaf Hering from novell bug #105878 */ + UNUSUAL_DEV( 0x0424, 0x0fdc, 0x0210, 0x0210, + "SMSC", +@@ -410,83 +346,6 @@ UNUSUAL_DEV( 0x04b0, 0x0301, 0x0010, 0x + US_SC_DEVICE, US_PR_DEVICE,NULL, + US_FL_NOT_LOCKABLE ), + +-/* Reported by Stefan de Konink */ +-UNUSUAL_DEV( 0x04b0, 0x0401, 0x0200, 0x0200, +- "NIKON", +- "NIKON DSC D100", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY), +- +-/* Reported by Tobias Kunze Briseno */ +-UNUSUAL_DEV( 0x04b0, 0x0403, 0x0200, 0x0200, +- "NIKON", +- "NIKON DSC D2H", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY), +- +-/* Reported by Milinevsky Dmitry */ +-UNUSUAL_DEV( 0x04b0, 0x0409, 0x0100, 0x0100, +- "NIKON", +- "NIKON DSC D50", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY), +- +-/* Reported by Andreas Bockhold */ +-UNUSUAL_DEV( 0x04b0, 0x0405, 0x0100, 0x0100, +- "NIKON", +- "NIKON DSC D70", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY), +- +-/* Reported by Jamie Kitson */ +-UNUSUAL_DEV( 0x04b0, 0x040d, 0x0100, 0x0100, +- "NIKON", +- "NIKON DSC D70s", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY), +- +-/* Reported by Graber and Mike Pagano */ +-UNUSUAL_DEV( 0x04b0, 0x040f, 0x0100, 0x0200, +- "NIKON", +- "NIKON DSC D200", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY), +- +-/* Reported by Emil Larsson */ +-UNUSUAL_DEV( 0x04b0, 0x0411, 0x0100, 0x0111, +- "NIKON", +- "NIKON DSC D80", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY), +- +-/* Reported by Ortwin Glueck */ +-UNUSUAL_DEV( 0x04b0, 0x0413, 0x0110, 0x0111, +- "NIKON", +- "NIKON DSC D40", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY), +- +-/* Reported by Paul Check */ +-UNUSUAL_DEV( 0x04b0, 0x0415, 0x0100, 0x0100, +- "NIKON", +- "NIKON DSC D2Xs", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY), +- +-/* Reported by Shan Destromp (shansan@gmail.com) */ +-UNUSUAL_DEV( 0x04b0, 0x0417, 0x0100, 0x0100, +- "NIKON", +- "NIKON DSC D40X", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY), +- +-/* Reported by paul ready */ +-UNUSUAL_DEV( 0x04b0, 0x0419, 0x0100, 0x0200, +- "NIKON", +- "NIKON DSC D300", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY), +- + /* Reported by Doug Maxey (dwm@austin.ibm.com) */ + UNUSUAL_DEV( 0x04b3, 0x4001, 0x0110, 0x0110, + "IBM", +@@ -2121,27 +1980,6 @@ UNUSUAL_DEV( 0x22b8, 0x3010, 0x0001, 0x + US_FL_FIX_CAPACITY | US_FL_IGNORE_RESIDUE ), + + /* +- * Patch by Pete Zaitcev +- * Report by Mark Patton. Red Hat bz#208928. +- * Added support for rev 0x0002 (Motorola ROKR W5) +- * by Javier Smaldone +- */ +-UNUSUAL_DEV( 0x22b8, 0x4810, 0x0001, 0x0002, +- "Motorola", +- "RAZR V3i/ROKR W5", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY), +- +-/* +- * Patch by Jost Diederichs +- */ +-UNUSUAL_DEV(0x22b8, 0x6410, 0x0001, 0x9999, +- "Motorola Inc.", +- "Motorola Phone (RAZRV3xx)", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY), +- +-/* + * Patch by Constantin Baranov + * Report by Andreas Koenecke. + * Motorola ROKR Z6. + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:55 2009 +Message-Id: <20090123010755.387552923@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:09 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Jarek Poplawski , + "David S. Miller" +Subject: [patch 18/46] pkt_sched: sch_htb: Fix deadlock in hrtimers triggered by HTB +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=pkt_sched-sch_htb-fix-deadlock-in-hrtimers-triggered-by-htb.patch +Content-Length: 1090 +Lines: 34 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Jarek Poplawski + +[ Upstream commit: none + + This is a quick fix for -stable purposes. Upstream fixes these + problems via a large set of invasive hrtimer changes. ] + +Most probably there is a (still unproven) race in hrtimers (before +2.6.29 kernels), which causes a corruption of hrtimers rbtree. This +patch doesn't fix it, but should let HTB avoid triggering the bug. + +Reported-by: Denys Fedoryschenko +Reported-by: Badalian Vyacheslav +Reported-by: Chris Caputo +Tested-by: Badalian Vyacheslav +Signed-off-by: Jarek Poplawski +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/sched/sch_htb.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/net/sched/sch_htb.c ++++ b/net/sched/sch_htb.c +@@ -924,6 +924,7 @@ static struct sk_buff *htb_dequeue(struc + } + } + sch->qstats.overlimits++; ++ qdisc_watchdog_cancel(&q->watchdog); + qdisc_watchdog_schedule(&q->watchdog, next_event); + fin: + return skb; + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:55 2009 +Message-Id: <20090123010755.525611041@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:10 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Herbert Xu , + "David S. Miller" +Subject: [patch 19/46] ipv6: Fix fib6_dump_table walker leak +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=ipv6-fix-fib6_dump_table-walker-leak.patch +Content-Length: 1248 +Lines: 51 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Herbert Xu + +[ Upstream commit: 7891cc818967e186be68caac32d84bfd0a3f0bd2 ] + +When a fib6 table dump is prematurely ended, we won't unlink +its walker from the list. This causes all sorts of grief for +other users of the list later. + +Reported-by: Chris Caputo +Signed-off-by: Herbert Xu +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/ipv6/ip6_fib.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +--- a/net/ipv6/ip6_fib.c ++++ b/net/ipv6/ip6_fib.c +@@ -298,6 +298,10 @@ static void fib6_dump_end(struct netlink + struct fib6_walker_t *w = (void*)cb->args[2]; + + if (w) { ++ if (cb->args[4]) { ++ cb->args[4] = 0; ++ fib6_walker_unlink(w); ++ } + cb->args[2] = 0; + kfree(w); + } +@@ -330,15 +334,12 @@ static int fib6_dump_table(struct fib6_t + read_lock_bh(&table->tb6_lock); + res = fib6_walk_continue(w); + read_unlock_bh(&table->tb6_lock); +- if (res != 0) { +- if (res < 0) +- fib6_walker_unlink(w); +- goto end; ++ if (res <= 0) { ++ fib6_walker_unlink(w); ++ cb->args[4] = 0; + } +- fib6_walker_unlink(w); +- cb->args[4] = 0; + } +-end: ++ + return res; + } + + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:55 2009 +Message-Id: <20090123010755.646274701@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:11 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Wei Yongjun , + Vlad Yasevich , + "David S. Miller" +Subject: [patch 20/46] sctp: Avoid memory overflow while FWD-TSN chunk is received with bad stream ID +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=sctp-avoid-memory-overflow-while-fwd-tsn-chunk-is-received-with-bad-stream-id.patch +Content-Length: 2368 +Lines: 75 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Wei Yongjun + +[ Upstream commit: 9fcb95a105758b81ef0131cd18e2db5149f13e95 ] + +If FWD-TSN chunk is received with bad stream ID, the sctp will not do the +validity check, this may cause memory overflow when overwrite the TSN of +the stream ID. + +The FORWARD-TSN chunk is like this: + +FORWARD-TSN chunk + Type = 192 + Flags = 0 + Length = 172 + NewTSN = 99 + Stream = 10000 + StreamSequence = 0xFFFF + +This patch fix this problem by discard the chunk if stream ID is not +less than MIS. + +Signed-off-by: Wei Yongjun +Signed-off-by: Vlad Yasevich +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/sctp/sm_statefuns.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +--- a/net/sctp/sm_statefuns.c ++++ b/net/sctp/sm_statefuns.c +@@ -3691,6 +3691,7 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn(c + { + struct sctp_chunk *chunk = arg; + struct sctp_fwdtsn_hdr *fwdtsn_hdr; ++ struct sctp_fwdtsn_skip *skip; + __u16 len; + __u32 tsn; + +@@ -3720,6 +3721,12 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn(c + if (sctp_tsnmap_check(&asoc->peer.tsn_map, tsn) < 0) + goto discard_noforce; + ++ /* Silently discard the chunk if stream-id is not valid */ ++ sctp_walk_fwdtsn(skip, chunk) { ++ if (ntohs(skip->stream) >= asoc->c.sinit_max_instreams) ++ goto discard_noforce; ++ } ++ + sctp_add_cmd_sf(commands, SCTP_CMD_REPORT_FWDTSN, SCTP_U32(tsn)); + if (len > sizeof(struct sctp_fwdtsn_hdr)) + sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_FWDTSN, +@@ -3751,6 +3758,7 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn_f + { + struct sctp_chunk *chunk = arg; + struct sctp_fwdtsn_hdr *fwdtsn_hdr; ++ struct sctp_fwdtsn_skip *skip; + __u16 len; + __u32 tsn; + +@@ -3780,6 +3788,12 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn_f + if (sctp_tsnmap_check(&asoc->peer.tsn_map, tsn) < 0) + goto gen_shutdown; + ++ /* Silently discard the chunk if stream-id is not valid */ ++ sctp_walk_fwdtsn(skip, chunk) { ++ if (ntohs(skip->stream) >= asoc->c.sinit_max_instreams) ++ goto gen_shutdown; ++ } ++ + sctp_add_cmd_sf(commands, SCTP_CMD_REPORT_FWDTSN, SCTP_U32(tsn)); + if (len > sizeof(struct sctp_fwdtsn_hdr)) + sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_FWDTSN, + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:55 2009 +Message-Id: <20090123010755.779078381@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:12 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Jarek Poplawski , + "David S. Miller" +Subject: [patch 21/46] pkt_sched: cls_u32: Fix locking in u32_change() +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=pkt_sched-cls_u32-fix-locking-in-u32_change.patch +Content-Length: 932 +Lines: 33 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Jarek Poplawski + +[ Upstream commit: 6f57321422e0d359e83c978c2b03db77b967b7d5 ] + +New nodes are inserted in u32_change() under rtnl_lock() with wmb(), +so without tcf_tree_lock() like in other classifiers (e.g. cls_fw). +This isn't enough without rmb() on the read side, but on the other +hand adding such barriers doesn't give any savings, so the lock is +added instead. + +Reported-by: m0sia +Signed-off-by: Jarek Poplawski +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/sched/cls_u32.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/net/sched/cls_u32.c ++++ b/net/sched/cls_u32.c +@@ -637,8 +637,9 @@ static int u32_change(struct tcf_proto * + break; + + n->next = *ins; +- wmb(); ++ tcf_tree_lock(tp); + *ins = n; ++ tcf_tree_unlock(tp); + + *arg = (unsigned long)n; + return 0; + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:56 2009 +Message-Id: <20090123010755.911231629@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:13 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Joe Chou , + Florian Fainelli , + "David S. Miller" +Subject: [patch 22/46] r6040: fix wrong logic in mdio code +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=r6040-fix-wrong-logic-in-mdio-code.patch +Content-Length: 958 +Lines: 36 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Joe Chou + +[ Upstream commit: 11e5e8f5d14a1229706576184d2cf4c4556ed94c ] + +This patch fixes a reverse logic in the MDIO code. + +Signed-off-by: Joe Chou +Signed-off-by: Florian Fainelli +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/r6040.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/r6040.c ++++ b/drivers/net/r6040.c +@@ -214,7 +214,7 @@ static int r6040_phy_read(void __iomem * + /* Wait for the read bit to be cleared */ + while (limit--) { + cmd = ioread16(ioaddr + MMDIO); +- if (cmd & MDIO_READ) ++ if (!(cmd & MDIO_READ)) + break; + } + +@@ -233,7 +233,7 @@ static void r6040_phy_write(void __iomem + /* Wait for the write bit to be cleared */ + while (limit--) { + cmd = ioread16(ioaddr + MMDIO); +- if (cmd & MDIO_WRITE) ++ if (!(cmd & MDIO_WRITE)) + break; + } + } + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:56 2009 +Message-Id: <20090123010756.067375706@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:14 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Joe Chou , + Florian Fainelli , + "David S. Miller" +Subject: [patch 23/46] r6040: save and restore MIER correctly in the interrupt routine +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=r6040-save-and-restore-mier-correctly-in-the-interrupt-routine.patch +Content-Length: 1422 +Lines: 51 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Joe Chou + +[ Upstream commit: 3e7c469f07ff14cbf9a814739e1fc99a863e0943 ] + +This patch saves the MIER register contents before treating +interrupts, then restores them correcty at the end of the +interrupt routine. + +Signed-off-by: Joe Chou +Signed-off-by: Florian Fainelli +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/r6040.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +--- a/drivers/net/r6040.c ++++ b/drivers/net/r6040.c +@@ -681,8 +681,10 @@ static irqreturn_t r6040_interrupt(int i + struct net_device *dev = dev_id; + struct r6040_private *lp = netdev_priv(dev); + void __iomem *ioaddr = lp->base; +- u16 status; ++ u16 misr, status; + ++ /* Save MIER */ ++ misr = ioread16(ioaddr + MIER); + /* Mask off RDC MAC interrupt */ + iowrite16(MSK_INT, ioaddr + MIER); + /* Read MISR status and clear */ +@@ -702,7 +704,7 @@ static irqreturn_t r6040_interrupt(int i + dev->stats.rx_fifo_errors++; + + /* Mask off RX interrupt */ +- iowrite16(ioread16(ioaddr + MIER) & ~RX_INTS, ioaddr + MIER); ++ misr &= ~RX_INTS; + netif_rx_schedule(dev, &lp->napi); + } + +@@ -710,6 +712,9 @@ static irqreturn_t r6040_interrupt(int i + if (status & TX_INTS) + r6040_tx(dev); + ++ /* Restore RDC MAC interrupt */ ++ iowrite16(misr, ioaddr + MIER); ++ + return IRQ_HANDLED; + } + + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:56 2009 +Message-Id: <20090123010756.205534187@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:15 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Florian Fainelli , + "David S. Miller" +Subject: [patch 24/46] r6040: bump release number to 0.19 +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=r6040-bump-release-number-to-0.19.patch +Content-Length: 718 +Lines: 28 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Florian Fainelli + +[ Upstream commit: 4707470ae7441733822efcd680b0ef3971921c4d ] + +This patch bumps the release number of the driver. + +Signed-off-by: Florian Fainelli +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/r6040.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/r6040.c ++++ b/drivers/net/r6040.c +@@ -49,8 +49,8 @@ + #include + + #define DRV_NAME "r6040" +-#define DRV_VERSION "0.18" +-#define DRV_RELDATE "13Jul2008" ++#define DRV_VERSION "0.19" ++#define DRV_RELDATE "18Dec2008" + + /* PHY CHIP Address */ + #define PHY1_ADDR 1 /* For MAC1 */ + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:56 2009 +Message-Id: <20090123010756.342283132@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:16 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Lennert Buytenhek , + "David S. Miller" +Subject: [patch 25/46] tcp: dont mask EOF and socket errors on nonblocking splice receive +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=tcp-don-t-mask-eof-and-socket-errors-on-nonblocking-splice-receive.patch +Content-Length: 1134 +Lines: 42 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Lennert Buytenhek + +[ Upstream commit: 4f7d54f59bc470f0aaa932f747a95232d7ebf8b1 ] + +Currently, setting SPLICE_F_NONBLOCK on splice from a TCP socket +results in masking of EOF (RDHUP) and error conditions on the socket +by an -EAGAIN return. Move the NONBLOCK check in tcp_splice_read() +to be after the EOF and error checks to fix this. + +Signed-off-by: Lennert Buytenhek +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/ipv4/tcp.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/net/ipv4/tcp.c ++++ b/net/ipv4/tcp.c +@@ -578,10 +578,6 @@ ssize_t tcp_splice_read(struct socket *s + else if (!ret) { + if (spliced) + break; +- if (flags & SPLICE_F_NONBLOCK) { +- ret = -EAGAIN; +- break; +- } + if (sock_flag(sk, SOCK_DONE)) + break; + if (sk->sk_err) { +@@ -599,6 +595,10 @@ ssize_t tcp_splice_read(struct socket *s + ret = -ENOTCONN; + break; + } ++ if (flags & SPLICE_F_NONBLOCK) { ++ ret = -EAGAIN; ++ break; ++ } + if (!timeo) { + ret = -EAGAIN; + break; + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:56 2009 +Message-Id: <20090123010756.475477435@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:17 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Alan Stern +Subject: [patch 26/46] USB: re-enable interface after driver unbinds +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=usb-re-enable-interface-after-driver-unbinds.patch +Content-Length: 6757 +Lines: 173 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Alan Stern + +commit 2caf7fcdb8532045680f06b67b9e63f0c9613aaa upstream. + +This patch (as1197) fixes an error introduced recently. Since a +significant number of devices can't handle Set-Interface requests, we +no longer call usb_set_interface() when a driver unbinds from an +interface, provided the interface is already in altsetting 0. However +the interface still does get disabled, and the call to +usb_set_interface() was the only thing re-enabling it. Since the +interface doesn't get re-enabled, further attempts to use it fail. + +So the patch adds a call to usb_enable_interface() when a driver +unbinds and the interface is in altsetting 0. For this to work +right, the interface's endpoints have to be re-enabled but their +toggles have to be left alone. Therefore an additional argument is +added to usb_enable_endpoint() and usb_enable_interface(), a flag +indicating whether or not the endpoint toggles should be reset. + +This is a forward-ported version of a patch which fixes Bugzilla +#12301. + +Signed-off-by: Alan Stern +Reported-by: David Roka +Reported-by: Erik Ekman +Tested-by: Erik Ekman +Tested-by: Alon Bar-Lev +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/core/driver.c | 9 ++++++--- + drivers/usb/core/hub.c | 2 +- + drivers/usb/core/message.c | 25 +++++++++++++++---------- + drivers/usb/core/usb.c | 2 +- + drivers/usb/core/usb.h | 4 +++- + 5 files changed, 26 insertions(+), 16 deletions(-) + +--- a/drivers/usb/core/driver.c ++++ b/drivers/usb/core/driver.c +@@ -279,9 +279,12 @@ static int usb_unbind_interface(struct d + * altsetting means creating new endpoint device entries). + * When either of these happens, defer the Set-Interface. + */ +- if (intf->cur_altsetting->desc.bAlternateSetting == 0) +- ; /* Already in altsetting 0 so skip Set-Interface */ +- else if (!error && intf->dev.power.status == DPM_ON) ++ if (intf->cur_altsetting->desc.bAlternateSetting == 0) { ++ /* Already in altsetting 0 so skip Set-Interface. ++ * Just re-enable it without affecting the endpoint toggles. ++ */ ++ usb_enable_interface(udev, intf, false); ++ } else if (!error && intf->dev.power.status == DPM_ON) + usb_set_interface(udev, intf->altsetting[0]. + desc.bInterfaceNumber, 0); + else +--- a/drivers/usb/core/hub.c ++++ b/drivers/usb/core/hub.c +@@ -2385,7 +2385,7 @@ void usb_ep0_reinit(struct usb_device *u + { + usb_disable_endpoint(udev, 0 + USB_DIR_IN); + usb_disable_endpoint(udev, 0 + USB_DIR_OUT); +- usb_enable_endpoint(udev, &udev->ep0); ++ usb_enable_endpoint(udev, &udev->ep0, true); + } + EXPORT_SYMBOL_GPL(usb_ep0_reinit); + +--- a/drivers/usb/core/message.c ++++ b/drivers/usb/core/message.c +@@ -1113,22 +1113,26 @@ void usb_disable_device(struct usb_devic + * usb_enable_endpoint - Enable an endpoint for USB communications + * @dev: the device whose interface is being enabled + * @ep: the endpoint ++ * @reset_toggle: flag to set the endpoint's toggle back to 0 + * +- * Resets the endpoint toggle, and sets dev->ep_{in,out} pointers. ++ * Resets the endpoint toggle if asked, and sets dev->ep_{in,out} pointers. + * For control endpoints, both the input and output sides are handled. + */ +-void usb_enable_endpoint(struct usb_device *dev, struct usb_host_endpoint *ep) ++void usb_enable_endpoint(struct usb_device *dev, struct usb_host_endpoint *ep, ++ bool reset_toggle) + { + int epnum = usb_endpoint_num(&ep->desc); + int is_out = usb_endpoint_dir_out(&ep->desc); + int is_control = usb_endpoint_xfer_control(&ep->desc); + + if (is_out || is_control) { +- usb_settoggle(dev, epnum, 1, 0); ++ if (reset_toggle) ++ usb_settoggle(dev, epnum, 1, 0); + dev->ep_out[epnum] = ep; + } + if (!is_out || is_control) { +- usb_settoggle(dev, epnum, 0, 0); ++ if (reset_toggle) ++ usb_settoggle(dev, epnum, 0, 0); + dev->ep_in[epnum] = ep; + } + ep->enabled = 1; +@@ -1138,17 +1142,18 @@ void usb_enable_endpoint(struct usb_devi + * usb_enable_interface - Enable all the endpoints for an interface + * @dev: the device whose interface is being enabled + * @intf: pointer to the interface descriptor ++ * @reset_toggles: flag to set the endpoints' toggles back to 0 + * + * Enables all the endpoints for the interface's current altsetting. + */ +-static void usb_enable_interface(struct usb_device *dev, +- struct usb_interface *intf) ++void usb_enable_interface(struct usb_device *dev, ++ struct usb_interface *intf, bool reset_toggles) + { + struct usb_host_interface *alt = intf->cur_altsetting; + int i; + + for (i = 0; i < alt->desc.bNumEndpoints; ++i) +- usb_enable_endpoint(dev, &alt->endpoint[i]); ++ usb_enable_endpoint(dev, &alt->endpoint[i], reset_toggles); + } + + /** +@@ -1271,7 +1276,7 @@ int usb_set_interface(struct usb_device + * during the SETUP stage - hence EP0 toggles are "don't care" here. + * (Likewise, EP0 never "halts" on well designed devices.) + */ +- usb_enable_interface(dev, iface); ++ usb_enable_interface(dev, iface, true); + if (device_is_registered(&iface->dev)) + usb_create_sysfs_intf_files(iface); + +@@ -1346,7 +1351,7 @@ int usb_reset_configuration(struct usb_d + alt = &intf->altsetting[0]; + + intf->cur_altsetting = alt; +- usb_enable_interface(dev, intf); ++ usb_enable_interface(dev, intf, true); + if (device_is_registered(&intf->dev)) + usb_create_sysfs_intf_files(intf); + } +@@ -1604,7 +1609,7 @@ free_interfaces: + alt = &intf->altsetting[0]; + + intf->cur_altsetting = alt; +- usb_enable_interface(dev, intf); ++ usb_enable_interface(dev, intf, true); + intf->dev.parent = &dev->dev; + intf->dev.driver = NULL; + intf->dev.bus = &usb_bus_type; +--- a/drivers/usb/core/usb.c ++++ b/drivers/usb/core/usb.c +@@ -362,7 +362,7 @@ struct usb_device *usb_alloc_dev(struct + dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE; + dev->ep0.desc.bDescriptorType = USB_DT_ENDPOINT; + /* ep0 maxpacket comes later, from device descriptor */ +- usb_enable_endpoint(dev, &dev->ep0); ++ usb_enable_endpoint(dev, &dev->ep0, true); + dev->can_submit = 1; + + /* Save readable and stable topology id, distinguishing devices +--- a/drivers/usb/core/usb.h ++++ b/drivers/usb/core/usb.h +@@ -10,7 +10,9 @@ extern int usb_create_ep_files(struct de + extern void usb_remove_ep_files(struct usb_host_endpoint *endpoint); + + extern void usb_enable_endpoint(struct usb_device *dev, +- struct usb_host_endpoint *ep); ++ struct usb_host_endpoint *ep, bool reset_toggle); ++extern void usb_enable_interface(struct usb_device *dev, ++ struct usb_interface *intf, bool reset_toggles); + extern void usb_disable_endpoint(struct usb_device *dev, unsigned int epaddr); + extern void usb_disable_interface(struct usb_device *dev, + struct usb_interface *intf); + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:56 2009 +Message-Id: <20090123010756.628992756@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:18 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + "Larry Finger" , + "Linux wireless" , + Christian Lamparter +Subject: [patch 27/46] p54usb: fix traffic stalls / packet drop +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=p54usb-fix-traffic-stalls-packet-drop.patch +Content-Length: 1753 +Lines: 48 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Christian Lamparter + +commit 00627f229c9807e4cb825a7ce36b886e2adf2229 upstream. + +All p54usb devices need a explicit termination packet, in oder to finish the pending transfer properly. +Else, the firmware could freeze, or simply drop the frame. + +Signed-off-by: Christian Lamparter +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/p54/p54usb.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/net/wireless/p54/p54usb.c ++++ b/drivers/net/wireless/p54/p54usb.c +@@ -215,6 +215,8 @@ static void p54u_tx_3887(struct ieee8021 + usb_fill_bulk_urb(data_urb, priv->udev, + usb_sndbulkpipe(priv->udev, P54U_PIPE_DATA), data, len, + free_on_tx ? p54u_tx_free_cb : p54u_tx_cb, dev); ++ addr_urb->transfer_flags |= URB_ZERO_PACKET; ++ data_urb->transfer_flags |= URB_ZERO_PACKET; + + usb_submit_urb(addr_urb, GFP_ATOMIC); + usb_submit_urb(data_urb, GFP_ATOMIC); +@@ -252,6 +254,7 @@ static void p54u_tx_lm87(struct ieee8021 + usb_sndbulkpipe(priv->udev, P54U_PIPE_DATA), hdr, + len + sizeof(*hdr), free_on_tx ? p54u_tx_free_cb : p54u_tx_cb, + dev); ++ data_urb->transfer_flags |= URB_ZERO_PACKET; + + usb_submit_urb(data_urb, GFP_ATOMIC); + } +@@ -294,11 +297,13 @@ static void p54u_tx_net2280(struct ieee8 + usb_fill_bulk_urb(int_urb, priv->udev, + usb_sndbulkpipe(priv->udev, P54U_PIPE_DEV), reg, sizeof(*reg), + p54u_tx_free_cb, dev); ++ int_urb->transfer_flags |= URB_ZERO_PACKET; + usb_submit_urb(int_urb, GFP_ATOMIC); + + usb_fill_bulk_urb(data_urb, priv->udev, + usb_sndbulkpipe(priv->udev, P54U_PIPE_DATA), hdr, len + sizeof(*hdr), + free_on_tx ? p54u_tx_free_cb : p54u_tx_cb, dev); ++ data_urb->transfer_flags |= URB_ZERO_PACKET; + usb_submit_urb(data_urb, GFP_ATOMIC); + } + + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:56 2009 +Message-Id: <20090123010756.758859122@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:19 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + netdev@vger.kernel.org, + netfilter-devel@vger.kernel.org, + Patrick McHardy , + davem@davemloft.net +Subject: [patch 28/46] netfilter: x_tables: fix match/target revision lookup +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=netfilter-x_tables-fix-match-target-revision-lookup.patch +Content-Length: 1082 +Lines: 44 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Patrick McHardy + +Upstream commit 656caff: + +Commit 55b69e91 (netfilter: implement NFPROTO_UNSPEC as a wildcard +for extensions) broke revision probing for matches and targets that +are registered with NFPROTO_UNSPEC. + +Fix by continuing the search on the NFPROTO_UNSPEC list if nothing +is found on the af-specific lists. + +Signed-off-by: Patrick McHardy +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/netfilter/x_tables.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/net/netfilter/x_tables.c ++++ b/net/netfilter/x_tables.c +@@ -273,6 +273,10 @@ static int match_revfn(u8 af, const char + have_rev = 1; + } + } ++ ++ if (af != NFPROTO_UNSPEC && !have_rev) ++ return match_revfn(NFPROTO_UNSPEC, name, revision, bestp); ++ + return have_rev; + } + +@@ -289,6 +293,10 @@ static int target_revfn(u8 af, const cha + have_rev = 1; + } + } ++ ++ if (af != NFPROTO_UNSPEC && !have_rev) ++ return target_revfn(NFPROTO_UNSPEC, name, revision, bestp); ++ + return have_rev; + } + + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:57 2009 +Message-Id: <20090123010756.890861793@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:20 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + netdev@vger.kernel.org, + netfilter-devel@vger.kernel.org, + Patrick McHardy , + davem@davemloft.net, + Jan Engelhardt +Subject: [patch 29/46] netfilter: ebtables: fix inversion in match code +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=netfilter-ebtables-fix-inversion-in-match-code.patch +Content-Length: 954 +Lines: 30 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Patrick McHardy + +Upstream commit d61ba9f: + +Commit 8cc784ee (netfilter: change return types of match functions +for ebtables extensions) broke ebtables matches by inverting the +sense of match/nomatch. + +Reported-by: Matt Cross +Signed-off-by: Jan Engelhardt +Signed-off-by: Patrick McHardy +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/bridge/netfilter/ebtables.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/net/bridge/netfilter/ebtables.c ++++ b/net/bridge/netfilter/ebtables.c +@@ -80,7 +80,7 @@ static inline int ebt_do_match (struct e + { + par->match = m->u.match; + par->matchinfo = m->data; +- return m->u.match->match(skb, par); ++ return m->u.match->match(skb, par) ? EBT_MATCH : EBT_NOMATCH; + } + + static inline int ebt_dev_check(char *entry, const struct net_device *device) + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:57 2009 +Message-Id: <20090123010757.020768946@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:21 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + netdev@vger.kernel.org, + netfilter-devel@vger.kernel.org, + Patrick McHardy , + davem@davemloft.net +Subject: [patch 30/46] netfilter: nf_conntrack: fix ICMP/ICMPv6 timeout sysctls on big-endian +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=netfilter-nf_conntrack-fix-icmp-icmpv6-timeout-sysctls-on-big-endian.patch +Content-Length: 1593 +Lines: 42 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Patrick McHardy + +Upstream commit 71320af: + +An old bug crept back into the ICMP/ICMPv6 conntrack protocols: the timeout +values are defined as unsigned longs, the sysctl's maxsize is set to +sizeof(unsigned int). Use unsigned int for the timeout values as in the +other conntrack protocols. + +Reported-by: Jean-Mickael Guerin +Signed-off-by: Patrick McHardy +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 2 +- + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c ++++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c +@@ -20,7 +20,7 @@ + #include + #include + +-static unsigned long nf_ct_icmp_timeout __read_mostly = 30*HZ; ++static unsigned int nf_ct_icmp_timeout __read_mostly = 30*HZ; + + static bool icmp_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff, + struct nf_conntrack_tuple *tuple) +--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c ++++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c +@@ -26,7 +26,7 @@ + #include + #include + +-static unsigned long nf_ct_icmpv6_timeout __read_mostly = 30*HZ; ++static unsigned int nf_ct_icmpv6_timeout __read_mostly = 30*HZ; + + static bool icmpv6_pkt_to_tuple(const struct sk_buff *skb, + unsigned int dataoff, + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:57 2009 +Message-Id: <20090123010757.146382606@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:22 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Pavel Roskin +Subject: [patch 31/46] dell_rbu: use scnprintf() instead of less secure sprintf() +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=dell_rbu-use-scnprintf-instead-of-less-secure-sprintf.patch +Content-Length: 1075 +Lines: 37 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Pavel Roskin + +commit 81156928f8fe31621e467490b9d441c0285998c3 upstream. + +Reading 0 bytes from /sys/devices/platform/dell_rbu/image_type or +/sys/devices/platform/dell_rbu/packet_size by an ordinary user causes an +oops. + +Signed-off-by: Pavel Roskin +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/firmware/dell_rbu.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/firmware/dell_rbu.c ++++ b/drivers/firmware/dell_rbu.c +@@ -576,7 +576,7 @@ static ssize_t read_rbu_image_type(struc + { + int size = 0; + if (!pos) +- size = sprintf(buffer, "%s\n", image_type); ++ size = scnprintf(buffer, count, "%s\n", image_type); + return size; + } + +@@ -648,7 +648,7 @@ static ssize_t read_rbu_packet_size(stru + int size = 0; + if (!pos) { + spin_lock(&rbu_data.lock); +- size = sprintf(buffer, "%lu\n", rbu_data.packetsize); ++ size = scnprintf(buffer, count, "%lu\n", rbu_data.packetsize); + spin_unlock(&rbu_data.lock); + } + return size; + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:57 2009 +Message-Id: <20090123010757.294256149@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:23 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Dave Kleikamp , + Benjamin Herrenschmidt +Subject: [patch 32/46] powerpc: is_hugepage_only_range() must account for both 4kB and 64kB slices +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=powerpc-is_hugepage_only_range-must-account-for-both-4kb-and-64kb-slices.patch +Content-Length: 1371 +Lines: 41 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Dave Kleikamp + +commit 9ba0fdbfaed2e74005d87fab948c5522b86ff733 upstream. + +powerpc: is_hugepage_only_range() must account for both 4kB and 64kB slices + +The subpage_prot syscall fails on second and subsequent calls for a given +region, because is_hugepage_only_range() is mis-identifying the 4 kB +slices when the process has a 64 kB page size. + +Signed-off-by: Dave Kleikamp +Signed-off-by: Benjamin Herrenschmidt +Signed-off-by: Greg Kroah-Hartman + +--- + arch/powerpc/mm/slice.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +--- a/arch/powerpc/mm/slice.c ++++ b/arch/powerpc/mm/slice.c +@@ -710,9 +710,18 @@ int is_hugepage_only_range(struct mm_str + unsigned long len) + { + struct slice_mask mask, available; ++ unsigned int psize = mm->context.user_psize; + + mask = slice_range_to_mask(addr, len); +- available = slice_mask_for_size(mm, mm->context.user_psize); ++ available = slice_mask_for_size(mm, psize); ++#ifdef CONFIG_PPC_64K_PAGES ++ /* We need to account for 4k slices too */ ++ if (psize == MMU_PAGE_64K) { ++ struct slice_mask compat_mask; ++ compat_mask = slice_mask_for_size(mm, MMU_PAGE_4K); ++ or_mask(available, compat_mask); ++ } ++#endif + + #if 0 /* too verbose */ + slice_dbg("is_hugepage_only_range(mm=%p, addr=%lx, len=%lx)\n", + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:57 2009 +Message-Id: <20090123010757.428433257@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:24 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Alistair John Strachan , + Hans de Goede , + Jean Delvare +Subject: [patch 33/46] hwmon: (abituguru3) Fix CONFIG_DMI=n fallback to probe +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=hwmon-fix-config_dmi-n-fallback-to-probe.patch +Content-Length: 910 +Lines: 31 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Alistair John Strachan + +commit 46a5f173fc88ffc22651162033696d8a9fbcdc5c upstream. + +When CONFIG_DMI is not enabled, dmi detection should flag that no board +could be detected (err=1) rather than another error condition (err<0). + +This fixes the fallback to manual probing for all motherboards, even +those without DMI strings, when CONFIG_DMI=n. + +Signed-off-by: Alistair John Strachan +Cc: Hans de Goede +Signed-off-by: Jean Delvare +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/hwmon/abituguru3.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/hwmon/abituguru3.c ++++ b/drivers/hwmon/abituguru3.c +@@ -1153,7 +1153,7 @@ static int __init abituguru3_dmi_detect( + + static inline int abituguru3_dmi_detect(void) + { +- return -ENODEV; ++ return 1; + } + + #endif /* CONFIG_DMI */ + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:57 2009 +Message-Id: <20090123010757.552539882@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:25 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Nick Piggin , + Chris Mason , + Dave Chinner +Subject: [patch 34/46] mm: write_cache_pages cyclic fix +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=mm-write_cache_pages-cyclic-fix.patch +Content-Length: 3087 +Lines: 105 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Nick Piggin + +commit 31a12666d8f0c22235297e1c1575f82061480029 upstream. + +In write_cache_pages, scanned == 1 is supposed to mean that cyclic +writeback has circled through zero, thus we should not circle again. +However it gets set to 1 after the first successful pagevec lookup. This +leads to cases where not enough data gets written. + +Counterexample: file with first 10 pages dirty, writeback_index == 5, +nr_to_write == 10. Then the 5 last pages will be found, and scanned will +be set to 1, after writing those out, we will not cycle back to get the +first 5. + +Rework this logic, now we'll always cycle unless we started off from index +0. When cycling, only write out as far as 1 page before the start page +from the first cycle (so we don't write parts of the file twice). + +Signed-off-by: Nick Piggin +Cc: Chris Mason +Cc: Dave Chinner +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + mm/page-writeback.c | 25 ++++++++++++++++++------- + 1 file changed, 18 insertions(+), 7 deletions(-) + +--- a/mm/page-writeback.c ++++ b/mm/page-writeback.c +@@ -868,9 +868,10 @@ int write_cache_pages(struct address_spa + int done = 0; + struct pagevec pvec; + int nr_pages; ++ pgoff_t uninitialized_var(writeback_index); + pgoff_t index; + pgoff_t end; /* Inclusive */ +- int scanned = 0; ++ int cycled; + int range_whole = 0; + long nr_to_write = wbc->nr_to_write; + +@@ -881,14 +882,19 @@ int write_cache_pages(struct address_spa + + pagevec_init(&pvec, 0); + if (wbc->range_cyclic) { +- index = mapping->writeback_index; /* Start from prev offset */ ++ writeback_index = mapping->writeback_index; /* prev offset */ ++ index = writeback_index; ++ if (index == 0) ++ cycled = 1; ++ else ++ cycled = 0; + end = -1; + } else { + index = wbc->range_start >> PAGE_CACHE_SHIFT; + end = wbc->range_end >> PAGE_CACHE_SHIFT; + if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) + range_whole = 1; +- scanned = 1; ++ cycled = 1; /* ignore range_cyclic tests */ + } + retry: + while (!done && (index <= end) && +@@ -897,7 +903,6 @@ retry: + min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1))) { + unsigned i; + +- scanned = 1; + for (i = 0; i < nr_pages; i++) { + struct page *page = pvec.pages[i]; + +@@ -915,7 +920,11 @@ retry: + continue; + } + +- if (!wbc->range_cyclic && page->index > end) { ++ if (page->index > end) { ++ /* ++ * can't be range_cyclic (1st pass) because ++ * end == -1 in that case. ++ */ + done = 1; + unlock_page(page); + continue; +@@ -946,13 +955,15 @@ retry: + pagevec_release(&pvec); + cond_resched(); + } +- if (!scanned && !done) { ++ if (!cycled) { + /* ++ * range_cyclic: + * We hit the last page and there is more work to be done: wrap + * back to the start of the file + */ +- scanned = 1; ++ cycled = 1; + index = 0; ++ end = writeback_index - 1; + goto retry; + } + if (!wbc->no_nrwrite_index_update) { + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:57 2009 +Message-Id: <20090123010757.682653067@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:26 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Nick Piggin , + Chris Mason , + Dave Chinner +Subject: [patch 35/46] mm: write_cache_pages early loop termination +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=mm-write_cache_pages-early-loop-termination.patch +Content-Length: 2321 +Lines: 66 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Nick Piggin + +commit bd19e012f6fd3b7309689165ea865cbb7bb88c1e upstream. + +We'd like to break out of the loop early in many situations, however the +existing code has been setting mapping->writeback_index past the final +page in the pagevec lookup for cyclic writeback. This is a problem if we +don't process all pages up to the final page. + +Currently the code mostly keeps writeback_index reasonable and hacked +around this by not breaking out of the loop or writing pages outside the +range in these cases. Keep track of a real "done index" that enables us +to terminate the loop in a much more flexible manner. + +Needed by the subsequent patch to preserve writepage errors, and then +further patches to break out of the loop early for other reasons. However +there are no functional changes with this patch alone. + +Signed-off-by: Nick Piggin +Cc: Chris Mason +Cc: Dave Chinner +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + mm/page-writeback.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/mm/page-writeback.c ++++ b/mm/page-writeback.c +@@ -871,6 +871,7 @@ int write_cache_pages(struct address_spa + pgoff_t uninitialized_var(writeback_index); + pgoff_t index; + pgoff_t end; /* Inclusive */ ++ pgoff_t done_index; + int cycled; + int range_whole = 0; + long nr_to_write = wbc->nr_to_write; +@@ -897,6 +898,7 @@ int write_cache_pages(struct address_spa + cycled = 1; /* ignore range_cyclic tests */ + } + retry: ++ done_index = index; + while (!done && (index <= end) && + (nr_pages = pagevec_lookup_tag(&pvec, mapping, &index, + PAGECACHE_TAG_DIRTY, +@@ -906,6 +908,8 @@ retry: + for (i = 0; i < nr_pages; i++) { + struct page *page = pvec.pages[i]; + ++ done_index = page->index + 1; ++ + /* + * At this point we hold neither mapping->tree_lock nor + * lock on the page itself: the page may be truncated or +@@ -968,7 +972,7 @@ retry: + } + if (!wbc->no_nrwrite_index_update) { + if (wbc->range_cyclic || (range_whole && nr_to_write > 0)) +- mapping->writeback_index = index; ++ mapping->writeback_index = done_index; + wbc->nr_to_write = nr_to_write; + } + + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:57 2009 +Message-Id: <20090123010757.803752816@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:27 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Nick Piggin , + Chris Mason , + Dave Chinner +Subject: [patch 36/46] mm: write_cache_pages writepage error fix +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=mm-write_cache_pages-writepage-error-fix.patch +Content-Length: 1894 +Lines: 63 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Nick Piggin + +commit 00266770b8b3a6a77f896ca501a0613739086832 upstream. + +In write_cache_pages, if ret signals a real error, but we still have some +pages left in the pagevec, done would be set to 1, but the remaining pages +would continue to be processed and ret will be overwritten in the process. + +It could easily be overwritten with success, and thus success will be +returned even if there is an error. Thus the caller is told all writes +succeeded, wheras in reality some did not. + +Fix this by bailing immediately if there is an error, and retaining the +first error code. + +This is a data integrity bug. + +Signed-off-by: Nick Piggin +Cc: Chris Mason +Cc: Dave Chinner +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + mm/page-writeback.c | 24 +++++++++++++++++++----- + 1 file changed, 19 insertions(+), 5 deletions(-) + +--- a/mm/page-writeback.c ++++ b/mm/page-writeback.c +@@ -944,12 +944,26 @@ retry: + } + + ret = (*writepage)(page, wbc, data); ++ if (unlikely(ret)) { ++ if (ret == AOP_WRITEPAGE_ACTIVATE) { ++ unlock_page(page); ++ ret = 0; ++ } else { ++ /* ++ * done_index is set past this page, ++ * so media errors will not choke ++ * background writeout for the entire ++ * file. This has consequences for ++ * range_cyclic semantics (ie. it may ++ * not be suitable for data integrity ++ * writeout). ++ */ ++ done = 1; ++ break; ++ } ++ } + +- if (unlikely(ret == AOP_WRITEPAGE_ACTIVATE)) { +- unlock_page(page); +- ret = 0; +- } +- if (ret || (--nr_to_write <= 0)) ++ if (--nr_to_write <= 0) + done = 1; + if (wbc->nonblocking && bdi_write_congested(bdi)) { + wbc->encountered_congestion = 1; + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:58 2009 +Message-Id: <20090123010757.925584850@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:28 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Nick Piggin , + Chris Mason , + Dave Chinner +Subject: [patch 37/46] mm: write_cache_pages integrity fix +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=mm-write_cache_pages-integrity-fix.patch +Content-Length: 3001 +Lines: 81 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Nick Piggin + +commit 05fe478dd04e02fa230c305ab9b5616669821dd3 upstream. + +In write_cache_pages, nr_to_write is heeded even for data-integrity syncs, +so the function will return success after writing out nr_to_write pages, +even if that was not sufficient to guarantee data integrity. + +The callers tend to set it to values that could break data interity +semantics easily in practice. For example, nr_to_write can be set to +mapping->nr_pages * 2, however if a file has a single, dirty page, then +fsync is called, subsequent pages might be concurrently added and dirtied, +then write_cache_pages might writeout two of these newly dirty pages, +while not writing out the old page that should have been written out. + +Fix this by ignoring nr_to_write if it is a data integrity sync. + +This is a data integrity bug. + +The reason this has been done in the past is to avoid stalling sync +operations behind page dirtiers. + + "If a file has one dirty page at offset 1000000000000000 then someone + does an fsync() and someone else gets in first and starts madly writing + pages at offset 0, we want to write that page at 1000000000000000. + Somehow." + +What we do today is return success after an arbitrary amount of pages are +written, whether or not we have provided the data-integrity semantics that +the caller has asked for. Even this doesn't actually fix all stall cases +completely: in the above situation, if the file has a huge number of pages +in pagecache (but not dirty), then mapping->nrpages is going to be huge, +even if pages are being dirtied. + +This change does indeed make the possibility of long stalls lager, and +that's not a good thing, but lying about data integrity is even worse. We +have to either perform the sync, or return -ELINUXISLAME so at least the +caller knows what has happened. + +There are subsequent competing approaches in the works to solve the stall +problems properly, without compromising data integrity. + +Signed-off-by: Nick Piggin +Cc: Chris Mason +Cc: Dave Chinner +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + mm/filemap.c | 2 +- + mm/page-writeback.c | 6 ++++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +--- a/mm/filemap.c ++++ b/mm/filemap.c +@@ -210,7 +210,7 @@ int __filemap_fdatawrite_range(struct ad + int ret; + struct writeback_control wbc = { + .sync_mode = sync_mode, +- .nr_to_write = mapping->nrpages * 2, ++ .nr_to_write = LONG_MAX, + .range_start = start, + .range_end = end, + }; +--- a/mm/page-writeback.c ++++ b/mm/page-writeback.c +@@ -963,8 +963,10 @@ retry: + } + } + +- if (--nr_to_write <= 0) +- done = 1; ++ if (wbc->sync_mode == WB_SYNC_NONE) { ++ if (--wbc->nr_to_write <= 0) ++ done = 1; ++ } + if (wbc->nonblocking && bdi_write_congested(bdi)) { + wbc->encountered_congestion = 1; + done = 1; + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:58 2009 +Message-Id: <20090123010758.075753378@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:29 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Nick Piggin , + Chris Mason , + Dave Chinner +Subject: [patch 38/46] mm: write_cache_pages cleanups +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=mm-write_cache_pages-cleanups.patch +Content-Length: 2521 +Lines: 90 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Nick Piggin + +commit 5a3d5c9813db56a75934eb1015367fda23a8b0b4 upstream. + +Get rid of some complex expressions from flow control statements, add a +comment, remove some duplicate code. + +Signed-off-by: Nick Piggin +Cc: Chris Mason +Cc: Dave Chinner +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + mm/page-writeback.c | 34 ++++++++++++++++++++++------------ + 1 file changed, 22 insertions(+), 12 deletions(-) + +--- a/mm/page-writeback.c ++++ b/mm/page-writeback.c +@@ -899,11 +899,14 @@ int write_cache_pages(struct address_spa + } + retry: + done_index = index; +- while (!done && (index <= end) && +- (nr_pages = pagevec_lookup_tag(&pvec, mapping, &index, +- PAGECACHE_TAG_DIRTY, +- min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1))) { +- unsigned i; ++ while (!done && (index <= end)) { ++ int i; ++ ++ nr_pages = pagevec_lookup_tag(&pvec, mapping, &index, ++ PAGECACHE_TAG_DIRTY, ++ min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1); ++ if (nr_pages == 0) ++ break; + + for (i = 0; i < nr_pages; i++) { + struct page *page = pvec.pages[i]; +@@ -919,7 +922,16 @@ retry: + */ + lock_page(page); + ++ /* ++ * Page truncated or invalidated. We can freely skip it ++ * then, even for data integrity operations: the page ++ * has disappeared concurrently, so there could be no ++ * real expectation of this data interity operation ++ * even if there is now a new, dirty page at the same ++ * pagecache address. ++ */ + if (unlikely(page->mapping != mapping)) { ++continue_unlock: + unlock_page(page); + continue; + } +@@ -930,18 +942,15 @@ retry: + * end == -1 in that case. + */ + done = 1; +- unlock_page(page); +- continue; ++ goto continue_unlock; + } + + if (wbc->sync_mode != WB_SYNC_NONE) + wait_on_page_writeback(page); + + if (PageWriteback(page) || +- !clear_page_dirty_for_io(page)) { +- unlock_page(page); +- continue; +- } ++ !clear_page_dirty_for_io(page)) ++ goto continue_unlock; + + ret = (*writepage)(page, wbc, data); + if (unlikely(ret)) { +@@ -964,7 +973,8 @@ retry: + } + + if (wbc->sync_mode == WB_SYNC_NONE) { +- if (--wbc->nr_to_write <= 0) ++ wbc->nr_to_write--; ++ if (wbc->nr_to_write <= 0) + done = 1; + } + if (wbc->nonblocking && bdi_write_congested(bdi)) { + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:58 2009 +Message-Id: <20090123010758.202213236@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:30 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Nick Piggin , + Chris Mason , + Dave Chinner +Subject: [patch 39/46] mm: write_cache_pages optimise page cleaning +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=mm-write_cache_pages-optimise-page-cleaning.patch +Content-Length: 1627 +Lines: 53 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Nick Piggin + +commit 515f4a037fb9ab736f8bad733fcd2ffd350cf265 upstream. + +In write_cache_pages, if we get stuck behind another process that is +cleaning pages, we will be forced to wait for them to finish, then perform +our own writeout (if it was redirtied during the long wait), then wait for +that. + +If a page under writeout is still clean, we can skip waiting for it (if +we're part of a data integrity sync, we'll be waiting for all writeout +pages afterwards, so we'll still be waiting for the other guy's write +that's cleaned the page). + +Signed-off-by: Nick Piggin +Cc: Chris Mason +Cc: Dave Chinner +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + mm/page-writeback.c | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +--- a/mm/page-writeback.c ++++ b/mm/page-writeback.c +@@ -945,11 +945,20 @@ continue_unlock: + goto continue_unlock; + } + +- if (wbc->sync_mode != WB_SYNC_NONE) +- wait_on_page_writeback(page); ++ if (!PageDirty(page)) { ++ /* someone wrote it for us */ ++ goto continue_unlock; ++ } ++ ++ if (PageWriteback(page)) { ++ if (wbc->sync_mode != WB_SYNC_NONE) ++ wait_on_page_writeback(page); ++ else ++ goto continue_unlock; ++ } + +- if (PageWriteback(page) || +- !clear_page_dirty_for_io(page)) ++ BUG_ON(PageWriteback(page)); ++ if (!clear_page_dirty_for_io(page)) + goto continue_unlock; + + ret = (*writepage)(page, wbc, data); + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:58 2009 +Message-Id: <20090123010758.332049360@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:31 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Nick Piggin , + Chris Mason , + Dave Chinner +Subject: [patch 40/46] mm: write_cache_pages terminate quickly +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=mm-write_cache_pages-terminate-quickly.patch +Content-Length: 2060 +Lines: 71 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Nick Piggin + +commit d5482cdf8a0aacb1e6468a97d5544f5829c8d8c4 upstream. + +Terminate the write_cache_pages loop upon encountering the first page past +end, without locking the page. Pages cannot have their index change when +we have a reference on them (truncate, eg truncate_inode_pages_range +performs the same check without the page lock). + +Signed-off-by: Nick Piggin +Cc: Chris Mason +Cc: Dave Chinner +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + mm/page-writeback.c | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +--- a/mm/page-writeback.c ++++ b/mm/page-writeback.c +@@ -911,15 +911,24 @@ retry: + for (i = 0; i < nr_pages; i++) { + struct page *page = pvec.pages[i]; + +- done_index = page->index + 1; +- + /* +- * At this point we hold neither mapping->tree_lock nor +- * lock on the page itself: the page may be truncated or +- * invalidated (changing page->mapping to NULL), or even +- * swizzled back from swapper_space to tmpfs file +- * mapping ++ * At this point, the page may be truncated or ++ * invalidated (changing page->mapping to NULL), or ++ * even swizzled back from swapper_space to tmpfs file ++ * mapping. However, page->index will not change ++ * because we have a reference on the page. + */ ++ if (page->index > end) { ++ /* ++ * can't be range_cyclic (1st pass) because ++ * end == -1 in that case. ++ */ ++ done = 1; ++ break; ++ } ++ ++ done_index = page->index + 1; ++ + lock_page(page); + + /* +@@ -936,15 +945,6 @@ continue_unlock: + continue; + } + +- if (page->index > end) { +- /* +- * can't be range_cyclic (1st pass) because +- * end == -1 in that case. +- */ +- done = 1; +- goto continue_unlock; +- } +- + if (!PageDirty(page)) { + /* someone wrote it for us */ + goto continue_unlock; + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:58 2009 +Message-Id: <20090123010758.467405041@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:32 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Nick Piggin , + Chris Mason , + Dave Chinner +Subject: [patch 41/46] mm: write_cache_pages more terminate quickly +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=mm-write_cache_pages-more-terminate-quickly.patch +Content-Length: 1051 +Lines: 38 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Andrew Morton + +commit 82fd1a9a8ced9607312b54859572bcc6211e8919 upstream. + +Now that we have the early-termination logic in place, it makes sense to +bail out early in all other cases where done is set to 1. + +Signed-off-by: Nick Piggin +Cc: Chris Mason +Cc: Dave Chinner +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + mm/page-writeback.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/mm/page-writeback.c ++++ b/mm/page-writeback.c +@@ -983,12 +983,15 @@ continue_unlock: + + if (wbc->sync_mode == WB_SYNC_NONE) { + wbc->nr_to_write--; +- if (wbc->nr_to_write <= 0) ++ if (wbc->nr_to_write <= 0) { + done = 1; ++ break; ++ } + } + if (wbc->nonblocking && bdi_write_congested(bdi)) { + wbc->encountered_congestion = 1; + done = 1; ++ break; + } + } + pagevec_release(&pvec); + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:58 2009 +Message-Id: <20090123010758.593564092@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:33 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Nick Piggin , + Chris Mason , + Dave Chinner +Subject: [patch 42/46] mm: do_sync_mapping_range integrity fix +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=mm-do_sync_mapping_range-integrity-fix.patch +Content-Length: 942 +Lines: 33 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Nick Piggin + +commit ee53a891f47444c53318b98dac947ede963db400 upstream. + +Chris Mason notices do_sync_mapping_range didn't actually ask for data +integrity writeout. Unfortunately, it is advertised as being usable for +data integrity operations. + +This is a data integrity bug. + +Signed-off-by: Nick Piggin +Cc: Chris Mason +Cc: Dave Chinner +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + fs/sync.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/sync.c ++++ b/fs/sync.c +@@ -287,7 +287,7 @@ int do_sync_mapping_range(struct address + + if (flags & SYNC_FILE_RANGE_WRITE) { + ret = __filemap_fdatawrite_range(mapping, offset, endbyte, +- WB_SYNC_NONE); ++ WB_SYNC_ALL); + if (ret < 0) + goto out; + } + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:58 2009 +Message-Id: <20090123010758.718451333@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:34 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Nick Piggin +Subject: [patch 43/46] mm: direct IO starvation improvement +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=mm-direct-io-starvation-improvement.patch +Content-Length: 2514 +Lines: 69 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Nick Piggin + +commit 48b47c561e41525061b5bc0cfd67d6367fd11dc4 upstream. + +Direct IO can invalidate and sync a lot of pagecache pages in the mapping. + A 4K direct IO will actually try to sync and/or invalidate the pagecache +of the entire file, for example (which might be many GB or TB large). + +Improve this by doing range syncs. Also, memory no longer has to be +unmapped to catch the dirty bits for syncing, as dirty bits would remain +coherent due to dirty mmap accounting. + +This fixes the immediate DM deadlocks when doing direct IO reads to block +device with a mounted filesystem, if only by papering over the problem +somewhat rather than addressing the fsync starvation cases. + +Signed-off-by: Nick Piggin +Reviewed-by: Jeff Moyer +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + mm/filemap.c | 16 +++++----------- + 1 file changed, 5 insertions(+), 11 deletions(-) + +--- a/mm/filemap.c ++++ b/mm/filemap.c +@@ -1317,7 +1317,8 @@ generic_file_aio_read(struct kiocb *iocb + goto out; /* skip atime */ + size = i_size_read(inode); + if (pos < size) { +- retval = filemap_write_and_wait(mapping); ++ retval = filemap_write_and_wait_range(mapping, pos, ++ pos + iov_length(iov, nr_segs) - 1); + if (!retval) { + retval = mapping->a_ops->direct_IO(READ, iocb, + iov, pos, nr_segs); +@@ -2067,18 +2068,10 @@ generic_file_direct_write(struct kiocb * + if (count != ocount) + *nr_segs = iov_shorten((struct iovec *)iov, *nr_segs, count); + +- /* +- * Unmap all mmappings of the file up-front. +- * +- * This will cause any pte dirty bits to be propagated into the +- * pageframes for the subsequent filemap_write_and_wait(). +- */ + write_len = iov_length(iov, *nr_segs); + end = (pos + write_len - 1) >> PAGE_CACHE_SHIFT; +- if (mapping_mapped(mapping)) +- unmap_mapping_range(mapping, pos, write_len, 0); + +- written = filemap_write_and_wait(mapping); ++ written = filemap_write_and_wait_range(mapping, pos, pos + write_len - 1); + if (written) + goto out; + +@@ -2298,7 +2291,8 @@ generic_file_buffered_write(struct kiocb + * the file data here, to try to honour O_DIRECT expectations. + */ + if (unlikely(file->f_flags & O_DIRECT) && written) +- status = filemap_write_and_wait(mapping); ++ status = filemap_write_and_wait_range(mapping, ++ pos, pos + written - 1); + + return written ? written : status; + } + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:58 2009 +Message-Id: <20090123010758.841114688@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:35 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Nick Piggin +Subject: [patch 44/46] fs: remove WB_SYNC_HOLD +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=fs-remove-wb_sync_hold.patch +Content-Length: 3546 +Lines: 87 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Nick Piggin + +commit 4f5a99d64c17470a784a6c68064207d82e3e74a5 upstream. + +Remove WB_SYNC_HOLD. The primary motiviation is the design of my +anti-starvation code for fsync. It requires taking an inode lock over the +sync operation, so we could run into lock ordering problems with multiple +inodes. It is possible to take a single global lock to solve the ordering +problem, but then that would prevent a future nice implementation of "sync +multiple inodes" based on lock order via inode address. + +Seems like a backward step to remove this, but actually it is busted +anyway: we can't use the inode lists for data integrity wait: an inode can +be taken off the dirty lists but still be under writeback. In order to +satisfy data integrity semantics, we should wait for it to finish +writeback, but if we only search the dirty lists, we'll miss it. + +It would be possible to have a "writeback" list, for sys_sync, I suppose. +But why complicate things by prematurely optimise? For unmounting, we +could avoid the "livelock avoidance" code, which would be easier, but +again premature IMO. + +Fixing the existing data integrity problem will come next. + +Signed-off-by: Nick Piggin +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + fs/fs-writeback.c | 12 ++---------- + include/linux/writeback.h | 1 - + 2 files changed, 2 insertions(+), 11 deletions(-) + +--- a/fs/fs-writeback.c ++++ b/fs/fs-writeback.c +@@ -421,9 +421,6 @@ __writeback_single_inode(struct inode *i + * If we're a pdlfush thread, then implement pdflush collision avoidance + * against the entire list. + * +- * WB_SYNC_HOLD is a hack for sys_sync(): reattach the inode to sb->s_dirty so +- * that it can be located for waiting on in __writeback_single_inode(). +- * + * If `bdi' is non-zero then we're being asked to writeback a specific queue. + * This function assumes that the blockdev superblock's inodes are backed by + * a variety of queues, so all inodes are searched. For other superblocks, +@@ -499,10 +496,6 @@ void generic_sync_sb_inodes(struct super + __iget(inode); + pages_skipped = wbc->pages_skipped; + __writeback_single_inode(inode, wbc); +- if (wbc->sync_mode == WB_SYNC_HOLD) { +- inode->dirtied_when = jiffies; +- list_move(&inode->i_list, &sb->s_dirty); +- } + if (current_is_pdflush()) + writeback_release(bdi); + if (wbc->pages_skipped != pages_skipped) { +@@ -588,8 +581,7 @@ restart: + + /* + * writeback and wait upon the filesystem's dirty inodes. The caller will +- * do this in two passes - one to write, and one to wait. WB_SYNC_HOLD is +- * used to park the written inodes on sb->s_dirty for the wait pass. ++ * do this in two passes - one to write, and one to wait. + * + * A finite limit is set on the number of pages which will be written. + * To prevent infinite livelock of sys_sync(). +@@ -600,7 +592,7 @@ restart: + void sync_inodes_sb(struct super_block *sb, int wait) + { + struct writeback_control wbc = { +- .sync_mode = wait ? WB_SYNC_ALL : WB_SYNC_HOLD, ++ .sync_mode = wait ? WB_SYNC_ALL : WB_SYNC_NONE, + .range_start = 0, + .range_end = LLONG_MAX, + }; +--- a/include/linux/writeback.h ++++ b/include/linux/writeback.h +@@ -30,7 +30,6 @@ static inline int task_is_pdflush(struct + enum writeback_sync_modes { + WB_SYNC_NONE, /* Don't wait on anything */ + WB_SYNC_ALL, /* Wait on every mapping */ +- WB_SYNC_HOLD, /* Hold the inode on sb_dirty for sys_sync() */ + }; + + /* + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:59 2009 +Message-Id: <20090123010758.986513264@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:36 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Nick Piggin +Subject: [patch 45/46] fs: sync_sb_inodes fix +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=fs-sync_sb_inodes-fix.patch +Content-Length: 3227 +Lines: 102 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Nick Piggin + +commit 38f21977663126fef53f5585e7f1653d8ebe55c4 upstream. + +Fix data integrity semantics required by sys_sync, by iterating over all +inodes and waiting for any writeback pages after the initial writeout. +Comments explain the exact problem. + +Signed-off-by: Nick Piggin +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + fs/fs-writeback.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 53 insertions(+), 7 deletions(-) + +--- a/fs/fs-writeback.c ++++ b/fs/fs-writeback.c +@@ -440,6 +440,7 @@ void generic_sync_sb_inodes(struct super + struct writeback_control *wbc) + { + const unsigned long start = jiffies; /* livelock avoidance */ ++ int sync = wbc->sync_mode == WB_SYNC_ALL; + + spin_lock(&inode_lock); + if (!wbc->for_kupdate || list_empty(&sb->s_io)) +@@ -516,7 +517,49 @@ void generic_sync_sb_inodes(struct super + if (!list_empty(&sb->s_more_io)) + wbc->more_io = 1; + } +- spin_unlock(&inode_lock); ++ ++ if (sync) { ++ struct inode *inode, *old_inode = NULL; ++ ++ /* ++ * Data integrity sync. Must wait for all pages under writeback, ++ * because there may have been pages dirtied before our sync ++ * call, but which had writeout started before we write it out. ++ * In which case, the inode may not be on the dirty list, but ++ * we still have to wait for that writeout. ++ */ ++ list_for_each_entry(inode, &sb->s_inodes, i_sb_list) { ++ struct address_space *mapping; ++ ++ if (inode->i_state & (I_FREEING|I_WILL_FREE)) ++ continue; ++ mapping = inode->i_mapping; ++ if (mapping->nrpages == 0) ++ continue; ++ __iget(inode); ++ spin_unlock(&inode_lock); ++ /* ++ * We hold a reference to 'inode' so it couldn't have ++ * been removed from s_inodes list while we dropped the ++ * inode_lock. We cannot iput the inode now as we can ++ * be holding the last reference and we cannot iput it ++ * under inode_lock. So we keep the reference and iput ++ * it later. ++ */ ++ iput(old_inode); ++ old_inode = inode; ++ ++ filemap_fdatawait(mapping); ++ ++ cond_resched(); ++ ++ spin_lock(&inode_lock); ++ } ++ spin_unlock(&inode_lock); ++ iput(old_inode); ++ } else ++ spin_unlock(&inode_lock); ++ + return; /* Leave any unwritten inodes on s_io */ + } + EXPORT_SYMBOL_GPL(generic_sync_sb_inodes); +@@ -596,13 +639,16 @@ void sync_inodes_sb(struct super_block * + .range_start = 0, + .range_end = LLONG_MAX, + }; +- unsigned long nr_dirty = global_page_state(NR_FILE_DIRTY); +- unsigned long nr_unstable = global_page_state(NR_UNSTABLE_NFS); + +- wbc.nr_to_write = nr_dirty + nr_unstable + +- (inodes_stat.nr_inodes - inodes_stat.nr_unused) + +- nr_dirty + nr_unstable; +- wbc.nr_to_write += wbc.nr_to_write / 2; /* Bit more for luck */ ++ if (!wait) { ++ unsigned long nr_dirty = global_page_state(NR_FILE_DIRTY); ++ unsigned long nr_unstable = global_page_state(NR_UNSTABLE_NFS); ++ ++ wbc.nr_to_write = nr_dirty + nr_unstable + ++ (inodes_stat.nr_inodes - inodes_stat.nr_unused); ++ } else ++ wbc.nr_to_write = LONG_MAX; /* doesn't actually matter */ ++ + sync_sb_inodes(sb, &wbc); + } + + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:59 2009 +Message-Id: <20090123010759.098807843@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:07:37 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk, + Nick Piggin +Subject: [patch 46/46] fs: sys_sync fix +References: <20090123010651.683741823@mini.kroah.org> +Content-Disposition: inline; filename=fs-sys_sync-fix.patch +Content-Length: 2000 +Lines: 79 + +2.6.28-stable review patch. If anyone has any objections, please let us know. + +------------------ + +From: Nick Piggin + +commit 856bf4d717feb8c55d4e2f817b71ebb70cfbc67b upstream. + +s_syncing livelock avoidance was breaking data integrity guarantee of +sys_sync, by allowing sys_sync to skip writing or waiting for superblocks +if there is a concurrent sys_sync happening. + +This livelock avoidance is much less important now that we don't have the +get_super_to_sync() call after every sb that we sync. This was replaced +by __put_super_and_need_restart. + +Signed-off-by: Nick Piggin +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + fs/fs-writeback.c | 20 +------------------- + include/linux/fs.h | 1 - + 2 files changed, 1 insertion(+), 20 deletions(-) + +--- a/fs/fs-writeback.c ++++ b/fs/fs-writeback.c +@@ -652,18 +652,6 @@ void sync_inodes_sb(struct super_block * + sync_sb_inodes(sb, &wbc); + } + +-/* +- * Rather lame livelock avoidance. +- */ +-static void set_sb_syncing(int val) +-{ +- struct super_block *sb; +- spin_lock(&sb_lock); +- list_for_each_entry_reverse(sb, &super_blocks, s_list) +- sb->s_syncing = val; +- spin_unlock(&sb_lock); +-} +- + /** + * sync_inodes - writes all inodes to disk + * @wait: wait for completion +@@ -690,9 +678,6 @@ static void __sync_inodes(int wait) + spin_lock(&sb_lock); + restart: + list_for_each_entry(sb, &super_blocks, s_list) { +- if (sb->s_syncing) +- continue; +- sb->s_syncing = 1; + sb->s_count++; + spin_unlock(&sb_lock); + down_read(&sb->s_umount); +@@ -710,13 +695,10 @@ restart: + + void sync_inodes(int wait) + { +- set_sb_syncing(0); + __sync_inodes(0); + +- if (wait) { +- set_sb_syncing(0); ++ if (wait) + __sync_inodes(1); +- } + } + + /** +--- a/include/linux/fs.h ++++ b/include/linux/fs.h +@@ -1124,7 +1124,6 @@ struct super_block { + struct rw_semaphore s_umount; + struct mutex s_lock; + int s_count; +- int s_syncing; + int s_need_sync_fs; + atomic_t s_active; + #ifdef CONFIG_SECURITY + + +From gregkh@mini.kroah.org Thu Jan 22 17:07:53 2009 +Message-Id: <20090123010651.683741823@mini.kroah.org> +User-Agent: quilt/0.47-1 +Date: Thu, 22 Jan 2009 17:06:51 -0800 +From: Greg KH +To: linux-kernel@vger.kernel.org, + stable@kernel.org +Cc: Justin Forbes , + Zwane Mwaikambo , + Theodore Ts'o , + Randy Dunlap , + Dave Jones , + Chuck Wolber , + Chris Wedgwood , + Michael Krufky , + Chuck Ebbert , + Domenico Andreoli , + Willy Tarreau , + Rodrigo Rubira Branco , + Jake Edge , + Eugene Teo , + torvalds@linux-foundation.org, + akpm@linux-foundation.org, + alan@lxorguk.ukuu.org.uk +Subject: [patch 00/46] 2.6.28-stable review +Content-Length: 3721 +Lines: 71 + +This is the start of the stable review cycle for the 2.6.28.2 release. +There are 46 patches in this series, all will be posted as a response to +this one. If anyone has any issues with these being applied, please let +us know. If anyone is a maintainer of the proper subsystem, and wants +to add a Signed-off-by: line to the patch, please respond with it. + +These patches are sent out with a number of different people on the Cc: +line. If you wish to be a reviewer, please email stable@kernel.org to +add your name to the list. If you want to be off the reviewer list, +also email us. + +Responses should be made by Sunday, January 25, 00:00:00 UTC. Anything +received after that time might be too late. + +The whole patch series can be found in one patch at: + kernel.org/pub/linux/kernel/v2.6/stable-review/patch-2.6.28.2-rc1.gz +and the diffstat can be found below. + + +thanks, + +greg k-h + + + Documentation/sound/alsa/ALSA-Configuration.txt | 3 +- + Makefile | 2 +- + arch/ia64/Kconfig | 1 + + arch/powerpc/mm/slice.c | 11 ++- + drivers/firmware/dell_rbu.c | 4 +- + drivers/hwmon/abituguru3.c | 2 +- + drivers/misc/sgi-xp/xpc_sn2.c | 2 +- + drivers/net/irda/irda-usb.c | 2 +- + drivers/net/r6040.c | 17 ++- + drivers/net/wireless/p54/p54usb.c | 6 + + drivers/net/wireless/rt2x00/rt73usb.c | 1 + + drivers/pci/pcie/aspm.c | 125 ++++++++++++++--- + drivers/usb/core/driver.c | 9 +- + drivers/usb/core/hub.c | 2 +- + drivers/usb/core/message.c | 25 ++-- + drivers/usb/core/usb.c | 2 +- + drivers/usb/core/usb.h | 4 +- + drivers/usb/storage/libusual.c | 7 + + drivers/usb/storage/scsiglue.c | 31 ++++ + drivers/usb/storage/transport.c | 80 ++++++++++ + drivers/usb/storage/unusual_devs.h | 178 ++--------------------- + drivers/usb/storage/usb.c | 6 + + drivers/usb/storage/usb.h | 4 + + fs/fs-writeback.c | 92 +++++++----- + fs/sync.c | 2 +- + include/linux/fs.h | 1 - + include/linux/usb_usual.h | 5 +- + include/linux/writeback.h | 1 - + kernel/sched_fair.c | 2 +- + lib/idr.c | 10 +- + mm/filemap.c | 18 +-- + mm/page-writeback.c | 121 +++++++++++----- + net/bridge/netfilter/ebtables.c | 2 +- + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 2 +- + net/ipv4/tcp.c | 8 +- + net/ipv6/ip6_fib.c | 15 +- + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 2 +- + net/netfilter/x_tables.c | 8 + + net/sched/cls_u32.c | 3 +- + net/sched/sch_htb.c | 1 + + net/sctp/sm_statefuns.c | 14 ++ + security/keys/keyctl.c | 1 + + sound/pci/hda/patch_analog.c | 49 ++++++- + sound/pci/hda/patch_realtek.c | 1 + + sound/pci/hda/patch_sigmatel.c | 16 ++ + sound/pci/oxygen/virtuoso.c | 17 ++- + 46 files changed, 585 insertions(+), 330 deletions(-) + diff --git a/queue-2.6.28/mm-direct-io-starvation-improvement.patch b/review-2.6.28/mm-direct-io-starvation-improvement.patch similarity index 100% rename from queue-2.6.28/mm-direct-io-starvation-improvement.patch rename to review-2.6.28/mm-direct-io-starvation-improvement.patch diff --git a/queue-2.6.28/mm-do_sync_mapping_range-integrity-fix.patch b/review-2.6.28/mm-do_sync_mapping_range-integrity-fix.patch similarity index 100% rename from queue-2.6.28/mm-do_sync_mapping_range-integrity-fix.patch rename to review-2.6.28/mm-do_sync_mapping_range-integrity-fix.patch diff --git a/queue-2.6.28/mm-write_cache_pages-cleanups.patch b/review-2.6.28/mm-write_cache_pages-cleanups.patch similarity index 100% rename from queue-2.6.28/mm-write_cache_pages-cleanups.patch rename to review-2.6.28/mm-write_cache_pages-cleanups.patch diff --git a/queue-2.6.28/mm-write_cache_pages-cyclic-fix.patch b/review-2.6.28/mm-write_cache_pages-cyclic-fix.patch similarity index 100% rename from queue-2.6.28/mm-write_cache_pages-cyclic-fix.patch rename to review-2.6.28/mm-write_cache_pages-cyclic-fix.patch diff --git a/queue-2.6.28/mm-write_cache_pages-early-loop-termination.patch b/review-2.6.28/mm-write_cache_pages-early-loop-termination.patch similarity index 100% rename from queue-2.6.28/mm-write_cache_pages-early-loop-termination.patch rename to review-2.6.28/mm-write_cache_pages-early-loop-termination.patch diff --git a/queue-2.6.28/mm-write_cache_pages-integrity-fix.patch b/review-2.6.28/mm-write_cache_pages-integrity-fix.patch similarity index 100% rename from queue-2.6.28/mm-write_cache_pages-integrity-fix.patch rename to review-2.6.28/mm-write_cache_pages-integrity-fix.patch diff --git a/queue-2.6.28/mm-write_cache_pages-more-terminate-quickly.patch b/review-2.6.28/mm-write_cache_pages-more-terminate-quickly.patch similarity index 100% rename from queue-2.6.28/mm-write_cache_pages-more-terminate-quickly.patch rename to review-2.6.28/mm-write_cache_pages-more-terminate-quickly.patch diff --git a/queue-2.6.28/mm-write_cache_pages-optimise-page-cleaning.patch b/review-2.6.28/mm-write_cache_pages-optimise-page-cleaning.patch similarity index 100% rename from queue-2.6.28/mm-write_cache_pages-optimise-page-cleaning.patch rename to review-2.6.28/mm-write_cache_pages-optimise-page-cleaning.patch diff --git a/queue-2.6.28/mm-write_cache_pages-terminate-quickly.patch b/review-2.6.28/mm-write_cache_pages-terminate-quickly.patch similarity index 100% rename from queue-2.6.28/mm-write_cache_pages-terminate-quickly.patch rename to review-2.6.28/mm-write_cache_pages-terminate-quickly.patch diff --git a/queue-2.6.28/mm-write_cache_pages-writepage-error-fix.patch b/review-2.6.28/mm-write_cache_pages-writepage-error-fix.patch similarity index 100% rename from queue-2.6.28/mm-write_cache_pages-writepage-error-fix.patch rename to review-2.6.28/mm-write_cache_pages-writepage-error-fix.patch diff --git a/queue-2.6.28/netfilter-ebtables-fix-inversion-in-match-code.patch b/review-2.6.28/netfilter-ebtables-fix-inversion-in-match-code.patch similarity index 100% rename from queue-2.6.28/netfilter-ebtables-fix-inversion-in-match-code.patch rename to review-2.6.28/netfilter-ebtables-fix-inversion-in-match-code.patch diff --git a/queue-2.6.28/netfilter-nf_conntrack-fix-icmp-icmpv6-timeout-sysctls-on-big-endian.patch b/review-2.6.28/netfilter-nf_conntrack-fix-icmp-icmpv6-timeout-sysctls-on-big-endian.patch similarity index 100% rename from queue-2.6.28/netfilter-nf_conntrack-fix-icmp-icmpv6-timeout-sysctls-on-big-endian.patch rename to review-2.6.28/netfilter-nf_conntrack-fix-icmp-icmpv6-timeout-sysctls-on-big-endian.patch diff --git a/queue-2.6.28/netfilter-x_tables-fix-match-target-revision-lookup.patch b/review-2.6.28/netfilter-x_tables-fix-match-target-revision-lookup.patch similarity index 100% rename from queue-2.6.28/netfilter-x_tables-fix-match-target-revision-lookup.patch rename to review-2.6.28/netfilter-x_tables-fix-match-target-revision-lookup.patch diff --git a/queue-2.6.28/p54usb-add-usb-id-for-thomson-speedtouch-121g.patch b/review-2.6.28/p54usb-add-usb-id-for-thomson-speedtouch-121g.patch similarity index 100% rename from queue-2.6.28/p54usb-add-usb-id-for-thomson-speedtouch-121g.patch rename to review-2.6.28/p54usb-add-usb-id-for-thomson-speedtouch-121g.patch diff --git a/queue-2.6.28/p54usb-fix-traffic-stalls-packet-drop.patch b/review-2.6.28/p54usb-fix-traffic-stalls-packet-drop.patch similarity index 100% rename from queue-2.6.28/p54usb-fix-traffic-stalls-packet-drop.patch rename to review-2.6.28/p54usb-fix-traffic-stalls-packet-drop.patch diff --git a/queue-2.6.28/pci-keep-aspm-link-state-consistent-throughout-pcie-hierarchy.patch b/review-2.6.28/pci-keep-aspm-link-state-consistent-throughout-pcie-hierarchy.patch similarity index 100% rename from queue-2.6.28/pci-keep-aspm-link-state-consistent-throughout-pcie-hierarchy.patch rename to review-2.6.28/pci-keep-aspm-link-state-consistent-throughout-pcie-hierarchy.patch diff --git a/queue-2.6.28/pkt_sched-cls_u32-fix-locking-in-u32_change.patch b/review-2.6.28/pkt_sched-cls_u32-fix-locking-in-u32_change.patch similarity index 100% rename from queue-2.6.28/pkt_sched-cls_u32-fix-locking-in-u32_change.patch rename to review-2.6.28/pkt_sched-cls_u32-fix-locking-in-u32_change.patch diff --git a/queue-2.6.28/pkt_sched-sch_htb-fix-deadlock-in-hrtimers-triggered-by-htb.patch b/review-2.6.28/pkt_sched-sch_htb-fix-deadlock-in-hrtimers-triggered-by-htb.patch similarity index 100% rename from queue-2.6.28/pkt_sched-sch_htb-fix-deadlock-in-hrtimers-triggered-by-htb.patch rename to review-2.6.28/pkt_sched-sch_htb-fix-deadlock-in-hrtimers-triggered-by-htb.patch diff --git a/queue-2.6.28/powerpc-is_hugepage_only_range-must-account-for-both-4kb-and-64kb-slices.patch b/review-2.6.28/powerpc-is_hugepage_only_range-must-account-for-both-4kb-and-64kb-slices.patch similarity index 100% rename from queue-2.6.28/powerpc-is_hugepage_only_range-must-account-for-both-4kb-and-64kb-slices.patch rename to review-2.6.28/powerpc-is_hugepage_only_range-must-account-for-both-4kb-and-64kb-slices.patch diff --git a/queue-2.6.28/r6040-bump-release-number-to-0.19.patch b/review-2.6.28/r6040-bump-release-number-to-0.19.patch similarity index 100% rename from queue-2.6.28/r6040-bump-release-number-to-0.19.patch rename to review-2.6.28/r6040-bump-release-number-to-0.19.patch diff --git a/queue-2.6.28/r6040-fix-wrong-logic-in-mdio-code.patch b/review-2.6.28/r6040-fix-wrong-logic-in-mdio-code.patch similarity index 100% rename from queue-2.6.28/r6040-fix-wrong-logic-in-mdio-code.patch rename to review-2.6.28/r6040-fix-wrong-logic-in-mdio-code.patch diff --git a/queue-2.6.28/r6040-save-and-restore-mier-correctly-in-the-interrupt-routine.patch b/review-2.6.28/r6040-save-and-restore-mier-correctly-in-the-interrupt-routine.patch similarity index 100% rename from queue-2.6.28/r6040-save-and-restore-mier-correctly-in-the-interrupt-routine.patch rename to review-2.6.28/r6040-save-and-restore-mier-correctly-in-the-interrupt-routine.patch diff --git a/queue-2.6.28/rt2x00-add-usb-id-for-the-linksys-wusb200.patch b/review-2.6.28/rt2x00-add-usb-id-for-the-linksys-wusb200.patch similarity index 100% rename from queue-2.6.28/rt2x00-add-usb-id-for-the-linksys-wusb200.patch rename to review-2.6.28/rt2x00-add-usb-id-for-the-linksys-wusb200.patch diff --git a/queue-2.6.28/sched-fix-update_min_vruntime.patch b/review-2.6.28/sched-fix-update_min_vruntime.patch similarity index 100% rename from queue-2.6.28/sched-fix-update_min_vruntime.patch rename to review-2.6.28/sched-fix-update_min_vruntime.patch diff --git a/queue-2.6.28/sctp-avoid-memory-overflow-while-fwd-tsn-chunk-is-received-with-bad-stream-id.patch b/review-2.6.28/sctp-avoid-memory-overflow-while-fwd-tsn-chunk-is-received-with-bad-stream-id.patch similarity index 100% rename from queue-2.6.28/sctp-avoid-memory-overflow-while-fwd-tsn-chunk-is-received-with-bad-stream-id.patch rename to review-2.6.28/sctp-avoid-memory-overflow-while-fwd-tsn-chunk-is-received-with-bad-stream-id.patch diff --git a/queue-2.6.28/security-introduce-missing-kfree.patch b/review-2.6.28/security-introduce-missing-kfree.patch similarity index 100% rename from queue-2.6.28/security-introduce-missing-kfree.patch rename to review-2.6.28/security-introduce-missing-kfree.patch diff --git a/queue-2.6.28/series b/review-2.6.28/series similarity index 100% rename from queue-2.6.28/series rename to review-2.6.28/series diff --git a/queue-2.6.28/sgi-xp-eliminate-false-detection-of-no-heartbeat.patch b/review-2.6.28/sgi-xp-eliminate-false-detection-of-no-heartbeat.patch similarity index 100% rename from queue-2.6.28/sgi-xp-eliminate-false-detection-of-no-heartbeat.patch rename to review-2.6.28/sgi-xp-eliminate-false-detection-of-no-heartbeat.patch diff --git a/queue-2.6.28/sound-virtuoso-do-not-overwrite-eeprom-on-xonar-d2-d2x.patch b/review-2.6.28/sound-virtuoso-do-not-overwrite-eeprom-on-xonar-d2-d2x.patch similarity index 100% rename from queue-2.6.28/sound-virtuoso-do-not-overwrite-eeprom-on-xonar-d2-d2x.patch rename to review-2.6.28/sound-virtuoso-do-not-overwrite-eeprom-on-xonar-d2-d2x.patch diff --git a/queue-2.6.28/tcp-don-t-mask-eof-and-socket-errors-on-nonblocking-splice-receive.patch b/review-2.6.28/tcp-don-t-mask-eof-and-socket-errors-on-nonblocking-splice-receive.patch similarity index 100% rename from queue-2.6.28/tcp-don-t-mask-eof-and-socket-errors-on-nonblocking-splice-receive.patch rename to review-2.6.28/tcp-don-t-mask-eof-and-socket-errors-on-nonblocking-splice-receive.patch diff --git a/queue-2.6.28/usb-re-enable-interface-after-driver-unbinds.patch b/review-2.6.28/usb-re-enable-interface-after-driver-unbinds.patch similarity index 100% rename from queue-2.6.28/usb-re-enable-interface-after-driver-unbinds.patch rename to review-2.6.28/usb-re-enable-interface-after-driver-unbinds.patch diff --git a/queue-2.6.28/usb-storage-add-last-sector-hacks.patch b/review-2.6.28/usb-storage-add-last-sector-hacks.patch similarity index 100% rename from queue-2.6.28/usb-storage-add-last-sector-hacks.patch rename to review-2.6.28/usb-storage-add-last-sector-hacks.patch diff --git a/queue-2.6.28/usb-storage-set-capacity_heuristics-flag-for-bad-vendors.patch b/review-2.6.28/usb-storage-set-capacity_heuristics-flag-for-bad-vendors.patch similarity index 100% rename from queue-2.6.28/usb-storage-set-capacity_heuristics-flag-for-bad-vendors.patch rename to review-2.6.28/usb-storage-set-capacity_heuristics-flag-for-bad-vendors.patch