Linux 3.0.43
I'm announcing the release of the 3.0.43 kernel.
All users of the 3.0 kernel series must upgrade.
The updated 3.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.0.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/alpha/include/asm/socket.h | 2 arch/arm/Kconfig | 1 arch/arm/include/asm/pgtable.h | 40 +++++++++-------- arch/arm/mm/flush.c | 2 arch/arm/mm/tlb-v7.S | 6 +- arch/arm/plat-s3c24xx/dma.c | 2 arch/parisc/include/asm/atomic.h | 4 - arch/powerpc/kernel/asm-offsets.c | 1 arch/powerpc/kernel/entry_64.S | 23 +++++++--- arch/powerpc/kernel/process.c | 12 ----- arch/x86/mm/hugetlbpage.c | 21 +++++++-- drivers/acpi/acpica/tbxface.c | 1 drivers/block/cciss_scsi.c | 11 ---- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 drivers/hwmon/asus_atk0110.c | 6 ++ drivers/input/serio/i8042-x86ia64io.h | 14 ++++++ drivers/media/dvb/siano/smsusb.c | 2 drivers/media/video/gspca/spca506.c | 2 drivers/net/wireless/ath/ath9k/recv.c | 2 drivers/net/wireless/p54/p54usb.c | 2 drivers/net/wireless/rtl818x/rtl8187/dev.c | 2 drivers/pci/pci-driver.c | 7 +++ drivers/scsi/megaraid/megaraid_sas_base.c | 3 - drivers/scsi/mpt2sas/mpt2sas_base.c | 13 +++-- drivers/scsi/scsi_error.c | 10 ++++ drivers/scsi/scsi_scan.c | 10 ++++ drivers/staging/vt6656/main_usb.c | 2 drivers/staging/winbond/wbusb.c | 2 drivers/usb/class/cdc-acm.c | 3 - drivers/usb/misc/emi62.c | 2 fs/buffer.c | 66 +++++++++++++---------------- fs/compat.c | 10 +++- fs/ext3/inode.c | 17 ++++++- fs/fuse/dev.c | 1 fs/nfs/nfs3proc.c | 2 fs/nfs/nfs4proc.c | 8 --- fs/nfs/super.c | 2 fs/open.c | 7 +-- fs/udf/file.c | 35 ++++++++++++--- kernel/audit_tree.c | 11 ++-- mm/mempolicy.c | 2 net/dccp/ccid.h | 4 - net/sunrpc/svc_xprt.c | 10 +--- net/sunrpc/svcsock.c | 2 sound/pci/hda/hda_proc.c | 2 sound/soc/codecs/wm9712.c | 19 +++++++- 47 files changed, 259 insertions(+), 150 deletions(-)
Al Viro (1):
vfs: missed source of ->f_pos races
Alex Deucher (1):
ACPI: export symbol acpi_get_table_with_size
Anton Blanchard (2):
powerpc: Fix DSCR inheritance in copy_thread()
powerpc: Restore correct DSCR in context switch
Arnd Bergmann (1):
ARM: imx: select CPU_FREQ_TABLE when needed
Dave Airlie (1):
drm/vmwgfx: add MODULE_DEVICE_TABLE so vmwgfx loads at boot
Dave Jones (1):
Remove user-triggerable BUG from mpol_to_str
Dmitry Torokhov (1):
Input: i8042 - add Gigabyte T1005 series netbooks to noloop table
Greg Kroah-Hartman (8):
USB: vt6656: remove __devinit* from the struct usb_device_id table
USB: emi62: remove __devinit* from the struct usb_device_id table
USB: winbond: remove __devinit* from the struct usb_device_id table
USB: spca506: remove __devinit* from the struct usb_device_id table
USB: p54usb: remove __devinit* from the struct usb_device_id table
USB: rtl8187: remove __devinit* from the struct usb_device_id table
USB: smsusb: remove __devinit* from the struct usb_device_id table Linux 3.0.43
Heiko Stuebner (1):
ARM: S3C24XX: Fix s3c2410_dma_enqueue parameters
Hugh Dickins (1):
block: replace __getblk_slow misfix by grow_dev_page fix
J. Bruce Fields (3):
svcrpc: fix BUG() in svc_tcp_clear_pages
svcrpc: fix svc_xprt_enqueue/svc_recv busy-looping
svcrpc: sends on closed socket should stop immediately
James Bottomley (1):
SCSI: Fix 'Device not ready' issue on mpt2sas
Jan Kara (2):
udf: Fix data corruption for files in ICB
ext3: Fix fdatasync() for files with only i_size changes
Kashyap Desai (1):
SCSI: megaraid_sas: Move poll_aen_lock initializer
Lorenzo Bianconi (1):
ath9k: fix decrypt_error initialization in ath_rx_tasklet()
Luca Tettamanti (1):
hwmon: (asus_atk0110) Add quirk for Asus M5A78L
Mark Brown (1):
ASoC: wm9712: Fix microphone source selection
Mathias Krause (1):
dccp: check ccid before dereferencing
Mel Gorman (1):
PARISC: Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts
Michael Cree (1):
alpha: Don't export SOCK_NONBLOCK to user space.
Michal Hocko (1):
mm: hugetlbfs: correctly populate shared pmd
Miklos Szeredi (4):
vfs: canonicalize create mode in build_open_flags()
audit: don't free_chunk() after fsnotify_add_mark()
audit: fix refcounting in audit-tree
fuse: fix retrieve length
Rafael J. Wysocki (1):
PCI: EHCI: Fix crash during hibernation on ASUS computers
Stephen M. Cameron (1):
cciss: fix incorrect scsi status reporting
Sven Schnelle (1):
USB: CDC ACM: Fix NULL pointer dereference
Trond Myklebust (2):
NFSv3: Ensure that do_proc_get_root() reports errors correctly NFSv4.1: Remove a bogus BUG_ON() in nfs4_layoutreturn_done
Wang Xingchao (1):
ALSA: hda - fix Copyright debug message
Will Deacon (3):
ARM: 7487/1: mm: avoid setting nG bit for user mappings that aren't present
ARM: 7488/1: mm: use 5 bits for swapfile type encoding
ARM: 7489/1: errata: fix workaround for erratum #720789 on UP systems
[email protected] (1):
NFS: Alias the nfs module to nfs4
[email protected] (1):
SCSI: mpt2sas: Fix for Driver oops, when loading driver with max_queue_depth command line option to a very small value
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 42 +SUBLEVEL = 43 EXTRAVERSION = NAME = Sneaky Weasel
arch/alpha/include/asm/socket.h +2 -0
@@ -69,9 +69,11 @@#define SO_RXQ_OVFL 40 +#ifdef __KERNEL__/* O_NONBLOCK clashes with the bits used for socket types. Therefore we * have to define SOCK_NONBLOCK to a different value here. */ #define SOCK_NONBLOCK 0x40000000 +#endif /* __KERNEL__ */ #endif /* _ASM_SOCKET_H */
arch/arm/Kconfig +1 -0
@@ -1875,6 +1875,7 @@ source "drivers/cpufreq/Kconfig" config CPU_FREQ_IMX tristate "CPUfreq driver for i.MX CPUs" depends on ARCH_MXC && CPU_FREQ + select CPU_FREQ_TABLE help This enables the CPUfreq driver for i.MX CPUs.
arch/arm/include/asm/pgtable.h +21 -19
@@ -360,6 +360,18 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd)#define set_pte_ext (ptep,pte,ext) cpu_set_pte_ext(ptep,pte,ext)#define pte_clear (mm,addr,ptep) set_pte_ext(ptep, __pte(0), 0) +#define pte_none (pte) (!pte_val(pte)) +#define pte_present (pte) (pte_val(pte) & L_PTE_PRESENT) +#define pte_write (pte) (!(pte_val(pte) & L_PTE_RDONLY)) +#define pte_dirty (pte) (pte_val(pte) & L_PTE_DIRTY) +#define pte_young (pte) (pte_val(pte) & L_PTE_YOUNG) +#define pte_exec (pte) (!(pte_val(pte) & L_PTE_XN)) +#define pte_special (pte) (0) + +#define pte_present_user (pte) \ + ((pte_val(pte) & (L_PTE_PRESENT | L_PTE_USER)) == \ + (L_PTE_PRESENT | L_PTE_USER)) +#if __LINUX_ARM_ARCH__ <6 static inline void __sync_icache_dcache (pte_t pteval) {
@@ -371,25 +383,15 @@ extern void __sync_icache_dcache(pte_t pteval);static inline void set_pte_at (struct mm_struct *mm,unsigned long addr,pte_t *ptep,pte_t pteval) { -if (addr >=TASK_SIZE ) -set_pte_ext (ptep, pteval,0 ); -else { +unsigned long ext =0 ; + +if (addr <TASK_SIZE &&pte_present_user (pteval)) {__sync_icache_dcache (pteval); -set_pte_ext (ptep, pteval,PTE_EXT_NG ); + ext |=PTE_EXT_NG ; } -} -#define pte_none (pte) (!pte_val(pte)) -#define pte_present (pte) (pte_val(pte) & L_PTE_PRESENT) -#define pte_write (pte) (!(pte_val(pte) & L_PTE_RDONLY)) -#define pte_dirty (pte) (pte_val(pte) & L_PTE_DIRTY) -#define pte_young (pte) (pte_val(pte) & L_PTE_YOUNG) -#define pte_exec (pte) (!(pte_val(pte) & L_PTE_XN)) -#define pte_special (pte) (0) - -#define pte_present_user (pte) \ - ((pte_val(pte) & (L_PTE_PRESENT | L_PTE_USER)) == \ - (L_PTE_PRESENT | L_PTE_USER)) +set_pte_ext (ptep, pteval, ext); +}#define PTE_BIT_FUNC (fn,op) \ static inline pte_t pte_##fn(pte_t pte) { pte_val(pte) op; return pte; }
@@ -416,13 +418,13 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)* * 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 -* <--------------- offset --------------------> <- type --> 0 0 0 +* <--------------- offset ----------------------> < type -> 0 0 0 * -* This gives us up to 63 swap files and 32GB per swap file. Note that +* This gives us up to 31 swap files and 64GB per swap file. Note that * the offset field is always non-zero. */ #define __SWP_TYPE_SHIFT 3 -#define __SWP_TYPE_BITS 6 +#define __SWP_TYPE_BITS 5#define __SWP_TYPE_MASK ((1 << __SWP_TYPE_BITS) - 1)#define __SWP_OFFSET_SHIFT (__SWP_TYPE_BITS + __SWP_TYPE_SHIFT)
arch/arm/mm/flush.c +0 -2
@@ -236,8 +236,6 @@ void __sync_icache_dcache(pte_t pteval)struct page *page;struct address_space *mapping; -if (!pte_present_user (pteval)) -return ;if (cache_is_vipt_nonaliasing () && !pte_exec (pteval))/* only flush non-aliasing VIPT caches for exec mappings */ return ;
arch/arm/mm/tlb-v7.S +3 -3
@@ -38,10 +38,10 @@ ENTRY(v7wbi_flush_user_tlb_range) dsb mov r0, r0, lsr #PAGE_SHIFT @ align address mov r1, r1, lsr #PAGE_SHIFT -#ifdef CONFIG_ARM_ERRATA_720789 - mov r3, #0 -#else asid r3, r3 @ mask ASID +#ifdef CONFIG_ARM_ERRATA_720789 + ALT_SMP(W(mov) r3, #0 ) + ALT_UP(W(nop) ) #endif orr r0, r3, r0, lsl #PAGE_SHIFT @ Create initial MVA mov r1, r1, lsl #PAGE_SHIFT
arch/arm/plat-s3c24xx/dma.c +1 -1
@@ -431,7 +431,7 @@ s3c2410_dma_canload(struct s3c2410_dma_chan *chan)* when necessary. */ -int s3c2410_dma_enqueue (unsigned int channel,void *id, +int s3c2410_dma_enqueue (enum dma_ch channel,void *id,dma_addr_t data,int size) {struct s3c2410_dma_chan *chan =s3c_dma_lookup_channel (channel);
arch/parisc/include/asm/atomic.h +2 -2
@@ -248,7 +248,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)#define atomic_sub_and_test (i,v) (atomic_sub_return((i),(v)) == 0) -#define ATOMIC_INIT (i) ((atomic_t) { (i) }) +#define ATOMIC_INIT (i) { (i) }#define smp_mb__before_atomic_dec () smp_mb()#define smp_mb__after_atomic_dec () smp_mb()
@@ -257,7 +257,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)#ifdef CONFIG_64BIT -#define ATOMIC64_INIT (i) ((atomic64_t) { (i) }) +#define ATOMIC64_INIT (i) { (i) }static __inline__s64 __atomic64_add_return (s64 i,atomic64_t *v)
arch/powerpc/kernel/asm-offsets.c +1 -0
@@ -75,6 +75,7 @@ int main(void)DEFINE (SIGSEGV ,SIGSEGV );DEFINE (NMI_MASK ,NMI_MASK );DEFINE (THREAD_DSCR , offsetof(struct thread_struct , dscr)); +DEFINE (THREAD_DSCR_INHERIT , offsetof(struct thread_struct , dscr_inherit));#else DEFINE (THREAD_INFO , offsetof(struct task_struct , stack));#endif /* CONFIG_PPC64 */
arch/powerpc/kernel/entry_64.S +17 -6
@@ -380,6 +380,12 @@ _GLOBAL(ret_from_fork) li r3,0 b syscall_exit + .section ".toc","aw" +DSCR_DEFAULT: + .tc dscr_default[TC],dscr_default + + .section ".text" + /* * This routine switches between two different tasks. The process * state of one is saved on its kernel stack. Then the state
@@ -519,9 +525,6 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT) mr r1,r8 /* start using new stack pointer */ std r7,PACAKSAVE(r13) - ld r6,_CCR(r1) - mtcrf 0xFF,r6 - #ifdef CONFIG_ALTIVEC BEGIN_FTR_SECTION ld r0,THREAD_VRSAVE(r4)
@@ -530,14 +533,22 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) #endif /* CONFIG_ALTIVEC */ #ifdef CONFIG_PPC64 BEGIN_FTR_SECTION + lwz r6,THREAD_DSCR_INHERIT(r4) + ld r7,DSCR_DEFAULT@toc(2) ld r0,THREAD_DSCR(r4) - cmpd r0,r25 - beq 1f + cmpwi r6,0 + bne 1f + ld r0,0(r7) +1: cmpd r0,r25 + beq 2f mtspr SPRN_DSCR,r0 -1: +2: END_FTR_SECTION_IFSET(CPU_FTR_DSCR) #endif + ld r6,_CCR(r1) + mtcrf 0xFF,r6 + /* r3-r13 are destroyed -- Cort */ REST_8GPRS(14, r1) REST_10GPRS(22, r1)
arch/powerpc/kernel/process.c +2 -10
@@ -794,16 +794,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,#endif /* CONFIG_PPC_STD_MMU_64 */ #ifdef CONFIG_PPC64 if (cpu_has_feature (CPU_FTR_DSCR )) { -if (current->thread.dscr_inherit) { - p->thread.dscr_inherit =1 ; - p->thread.dscr = current->thread.dscr; - }else if (0 != dscr_default) { - p->thread.dscr_inherit =1 ; - p->thread.dscr = dscr_default; - }else { - p->thread.dscr_inherit =0 ; - p->thread.dscr =0 ; - } + p->thread.dscr_inherit = current->thread.dscr_inherit; + p->thread.dscr = current->thread.dscr; }#endif
arch/x86/mm/hugetlbpage.c +16 -5
@@ -56,9 +56,16 @@ static int vma_shareable(struct vm_area_struct *vma, unsigned long addr) }/* -* search for a shareable pmd page for hugetlb. +* Search for a shareable pmd page for hugetlb. In any case calls pmd_alloc() +* and returns the corresponding pte. While this is not necessary for the +* !shared pmd case because we can allocate the pmd later as well, it makes the +* code much cleaner. pmd allocation is essential for the shared case because +* pud has to be populated inside the same i_mmap_mutex section - otherwise +* racing tasks could either miss the sharing (see huge_pte_offset) or select a +* bad pmd for sharing. */ -static void huge_pmd_share (struct mm_struct *mm,unsigned long addr,pud_t *pud) +static pte_t * +huge_pmd_share (struct mm_struct *mm,unsigned long addr,pud_t *pud) {struct vm_area_struct *vma =find_vma (mm, addr);struct address_space *mapping = vma->vm_file->f_mapping;
@@ -68,9 +75,10 @@ static void huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud)struct vm_area_struct *svma;unsigned long saddr;pte_t *spte =NULL ; +pte_t *pte;if (!vma_shareable (vma, addr)) -return ; +return (pte_t *)pmd_alloc (mm, pud, addr);mutex_lock (&mapping->i_mmap_mutex); vma_prio_tree_foreach(svma, &iter, &mapping->i_mmap, idx, idx) {
@@ -97,7 +105,9 @@ static void huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud)put_page (virt_to_page (spte));spin_unlock (&mm->page_table_lock); out: + pte = (pte_t *)pmd_alloc (mm, pud, addr);mutex_unlock (&mapping->i_mmap_mutex); +return pte; }/*
@@ -142,8 +152,9 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, }else {BUG_ON (sz !=PMD_SIZE );if (pud_none (*pud)) -huge_pmd_share (mm, addr, pud); - pte = (pte_t *)pmd_alloc (mm, pud, addr); + pte =huge_pmd_share (mm, addr, pud); +else + pte = (pte_t *)pmd_alloc (mm, pud, addr); } }BUG_ON (pte && !pte_none (*pte) && !pte_huge (*pte));
drivers/acpi/acpica/tbxface.c +1 -0
@@ -435,6 +435,7 @@ acpi_get_table_with_size(char *signature,return (AE_NOT_FOUND ); } +ACPI_EXPORT_SYMBOL (acpi_get_table_with_size) acpi_status acpi_get_table(char *signature,
drivers/block/cciss_scsi.c +1 -10
@@ -763,16 +763,7 @@ static void complete_scsi_command(CommandList_struct *c, int timeout, {case CMD_TARGET_STATUS :/* Pass it up to the upper layers... */ -if ( ei->ScsiStatus) - { -#if 0 -printk (KERN_WARNING "cciss: cmd %p " -"has SCSI Status = %x\n" , - c, ei->ScsiStatus); -#endif - cmd->result |= (ei->ScsiStatus <<1 ); - } -else {/* scsi status is zero??? How??? */ +if (!ei->ScsiStatus) {/* Ordinarily, this case should never happen, but there is a bug in some released firmware revisions that allows it to happen
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +1 -0
@@ -147,6 +147,7 @@ static struct pci_device_id vmw_pci_id_list[] = { {0x15ad, 0x0405, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VMWGFX_CHIP_SVGAII}, {0, 0, 0} }; +MODULE_DEVICE_TABLE (pci, vmw_pci_id_list);static int enable_fbdev;
drivers/hwmon/asus_atk0110.c +6 -0
@@ -34,6 +34,12 @@ static const struct dmi_system_id __initconst atk_force_new_if[] = { .matches = { DMI_MATCH(DMI_BOARD_NAME, "SABERTOOTH X58") } + }, { +/* Old interface reads the same sensor for fan0 and fan1 */ + .ident = "Asus M5A78L", + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "M5A78L") + } }, { } };
drivers/input/serio/i8042-x86ia64io.h +14 -0
@@ -177,6 +177,20 @@ static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = { }, }, { +/* Gigabyte T1005 - defines wrong chassis type ("Other") */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"GIGABYTE" ), + DMI_MATCH(DMI_PRODUCT_NAME, "T1005"), + }, + }, + { +/* Gigabyte T1005M/P - defines wrong chassis type ("Other") */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"GIGABYTE" ), + DMI_MATCH(DMI_PRODUCT_NAME, "T1005M/P"), + }, + }, + { .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv9700"),
drivers/media/dvb/siano/smsusb.c +1 -1
@@ -480,7 +480,7 @@ static int smsusb_resume(struct usb_interface *intf)return 0 ; } -static const struct usb_device_id smsusb_id_table[]__devinitconst = { +static const struct usb_device_id smsusb_id_table[] = { {USB_DEVICE (0x187f ,0x0010 ), .driver_info =SMS1XXX_BOARD_SIANO_STELLAR }, {USB_DEVICE (0x187f ,0x0100 ),
drivers/media/video/gspca/spca506.c +1 -1
@@ -685,7 +685,7 @@ static const struct sd_desc sd_desc = { };/* -- module initialisation -- */ -static const struct usb_device_id device_table[]__devinitconst = { +static const struct usb_device_id device_table[] = { {USB_DEVICE (0x06e1 ,0xa190 )},/*fixme: may be IntelPCCameraPro BRIDGE_SPCA505 {USB_DEVICE(0x0733, 0x0430)}, */
drivers/net/wireless/ath/ath9k/recv.c +1 -1
@@ -1697,7 +1697,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)struct ieee80211_hw *hw = sc->hw;struct ieee80211_hdr *hdr;int retval; -bool decrypt_error = false;struct ath_rx_status rs;enum ath9k_rx_qtype qtype;bool edma = !!(ah->caps.hw_caps &ATH9K_HW_CAP_EDMA );
@@ -1719,6 +1718,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) tsf_lower = tsf &0xffffffff ; do { + bool decrypt_error = false; /* If handling rx interrupt and flush is in progress => exit */ if ((sc->sc_flags & SC_OP_RXFLUSH) && (flush == 0)) break;
drivers/net/wireless/p54/p54usb.c +1 -1
@@ -41,7 +41,7 @@ MODULE_FIRMWARE("isl3887usb");* whenever you add a new device. */ -static struct usb_device_id p54u_table[]__devinitdata = { +static struct usb_device_id p54u_table[] = {/* Version 1 devices (pci chip + net2280) */ {USB_DEVICE (0x0411 ,0x0050 )},/* Buffalo WLI2-USB2-G54 */ {USB_DEVICE (0x045e ,0x00c2 )},/* Microsoft MN-710 */
drivers/net/wireless/rtl818x/rtl8187/dev.c +1 -1
@@ -43,7 +43,7 @@ MODULE_AUTHOR("Larry Finger <[email protected]>");MODULE_DESCRIPTION ("RTL8187/RTL8187B USB wireless driver" );MODULE_LICENSE ("GPL" ); -static struct usb_device_id rtl8187_table[]__devinitdata = { +static struct usb_device_id rtl8187_table[] = {/* Asus */ {USB_DEVICE (0x0b05 ,0x171d ), .driver_info =DEVICE_RTL8187 },/* Belkin */
drivers/pci/pci-driver.c +7 -0
@@ -936,6 +936,13 @@ static int pci_pm_poweroff_noirq(struct device *dev)if (!pci_dev->state_saved && !pci_is_bridge (pci_dev))pci_prepare_to_sleep (pci_dev); +/* +* The reason for doing this here is the same as for the analogous code +* in pci_pm_suspend_noirq(). +*/ +if (pci_dev->class ==PCI_CLASS_SERIAL_USB_EHCI ) +pci_write_config_word (pci_dev,PCI_COMMAND ,0 ); +return 0 ; }
drivers/scsi/megaraid/megaraid_sas_base.c +2 -1
@@ -4052,7 +4052,6 @@ megasas_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)spin_lock_init (&instance->cmd_pool_lock);spin_lock_init (&instance->hba_lock);spin_lock_init (&instance->completion_lock); -spin_lock_init (&poll_aen_lock);mutex_init (&instance->aen_mutex);mutex_init (&instance->reset_mutex);
@@ -5380,6 +5379,8 @@ static int __init megasas_init(void)printk (KERN_INFO "megasas: %s %s\n" ,MEGASAS_VERSION ,MEGASAS_EXT_VERSION ); +spin_lock_init (&poll_aen_lock); + support_poll_for_event =2 ; support_device_change =1 ;
drivers/scsi/mpt2sas/mpt2sas_base.c +8 -5
@@ -2140,10 +2140,13 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc, int sleep_flag) }/* command line tunables for max controller queue depth */ -if (max_queue_depth !=-1 ) - max_request_credit = (max_queue_depth < facts->RequestCredit) - ? max_queue_depth : facts->RequestCredit; -else +if (max_queue_depth !=-1 && max_queue_depth !=0 ) { + max_request_credit =min_t (u16, max_queue_depth + + ioc->hi_priority_depth + ioc->internal_depth, + facts->RequestCredit); +if (max_request_credit >MAX_HBA_QUEUE_DEPTH ) + max_request_credit =MAX_HBA_QUEUE_DEPTH ; + }else max_request_credit =min_t (u16, facts->RequestCredit,MAX_HBA_QUEUE_DEPTH );
@@ -2218,7 +2221,7 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)/* set the scsi host can_queue depth * with some internal commands that could be outstanding */ - ioc->shost->can_queue = ioc->scsiio_depth - (2 ); + ioc->shost->can_queue = ioc->scsiio_depth;dinitprintk (ioc,printk (MPT2SAS_INFO_FMT "scsi host: " "can_queue depth (%d)\n" , ioc->name, ioc->shost->can_queue));
drivers/scsi/scsi_error.c +10 -0
@@ -41,6 +41,8 @@#include <trace/events/scsi.h> +static void scsi_eh_done (struct scsi_cmnd *scmd); +#define SENSE_TIMEOUT (10*HZ)/*
@@ -240,6 +242,14 @@ static int scsi_check_sense(struct scsi_cmnd *scmd)if (!scsi_command_normalize_sense (scmd, &sshdr))return FAILED ;/* no valid sense data */ +if (scmd->cmnd[0 ] ==TEST_UNIT_READY && scmd->scsi_done != scsi_eh_done) +/* +* nasty: for mid-layer issued TURs, we need to return the +* actual sense data without any recovery attempt. For eh +* issued ones, we need to try to recover and interpret +*/ +return SUCCESS ; +if (scsi_sense_is_deferred (&sshdr))return NEEDS_RETRY ;
drivers/scsi/scsi_scan.c +10 -0
@@ -776,6 +776,16 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result, sdev->model = (char *) (sdev->inquiry +16 ); sdev->rev = (char *) (sdev->inquiry +32 ); +if (strncmp (sdev->vendor,"ATA " ,8 ) ==0 ) { +/* +* sata emulation layer device. This is a hack to work around +* the SATL power management specifications which state that +* when the SATL detects the device has gone into standby +* mode, it shall respond with NOT READY. +*/ + sdev->allow_restart =1 ; + } +if (*bflags &BLIST_ISROM ) { sdev->type =TYPE_ROM ; sdev->removable =1 ;
drivers/staging/vt6656/main_usb.c +1 -1
@@ -222,7 +222,7 @@ DEVICE_PARAM(b80211hEnable, "802.11h mode");// Static vars definitions // -static struct usb_device_id vt6656_table[]__devinitdata = { +static struct usb_device_id vt6656_table[] = { {USB_DEVICE (VNT_USB_VENDOR_ID ,VNT_USB_PRODUCT_ID )}, {} };
drivers/staging/winbond/wbusb.c +1 -1
@@ -24,7 +24,7 @@ MODULE_DESCRIPTION("IS89C35 802.11bg WLAN USB Driver");MODULE_LICENSE ("GPL" );MODULE_VERSION ("0.1" ); -static const struct usb_device_id wb35_table[]__devinitconst = { +static const struct usb_device_id wb35_table[] = { {USB_DEVICE (0x0416 ,0x0035 ) }, {USB_DEVICE (0x18E8 ,0x6201 ) }, {USB_DEVICE (0x18E8 ,0x6206 ) },
drivers/usb/class/cdc-acm.c +2 -1
@@ -1043,7 +1043,8 @@ skip_normal_probe: } -if (data_interface->cur_altsetting->desc.bNumEndpoints <2 ) +if (data_interface->cur_altsetting->desc.bNumEndpoints <2 || + control_interface->cur_altsetting->desc.bNumEndpoints ==0 )return -EINVAL ; epctrl = &control_interface->cur_altsetting->endpoint[0 ].desc;
drivers/usb/misc/emi62.c +1 -1
@@ -259,7 +259,7 @@ wraperr:return err; } -static const struct usb_device_id id_table[]__devinitconst = { +static const struct usb_device_id id_table[] = { {USB_DEVICE (EMI62_VENDOR_ID ,EMI62_PRODUCT_ID ) }, { }/* Terminating entry */ };
fs/buffer.c +30 -36
145 lines not on this page · raw message
fs/compat.c +8 -2
@@ -1177,11 +1177,14 @@ compat_sys_readv(unsigned long fd, const struct compat_iovec __user *vec,struct file *file;int fput_needed;ssize_t ret; +loff_t pos; file =fget_light (fd, &fput_needed);if (!file)return -EBADF ; - ret =compat_readv (file, vec, vlen, &file->f_pos); + pos = file->f_pos; + ret =compat_readv (file, vec, vlen, &pos); + file->f_pos = pos;fput_light (file, fput_needed);return ret; }
@@ -1236,11 +1239,14 @@ compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec,struct file *file;int fput_needed;ssize_t ret; +loff_t pos; file =fget_light (fd, &fput_needed);if (!file)return -EBADF ; - ret =compat_writev (file, vec, vlen, &file->f_pos); + pos = file->f_pos; + ret =compat_writev (file, vec, vlen, &pos); + file->f_pos = pos;fput_light (file, fput_needed);return ret; }
fs/ext3/inode.c +14 -3
@@ -3013,6 +3013,8 @@ static int ext3_do_update_inode(handle_t *handle,struct ext3_inode_info *ei =EXT3_I (inode);struct buffer_head *bh = iloc->bh;int err =0 , rc, block; +int need_datasync =0 ; +__le32 disksize; again:/* we can't allow multiple procs in here at once, its a bit racey */
@@ -3050,7 +3052,11 @@ again: raw_inode->i_gid_high =0 ; } raw_inode->i_links_count =cpu_to_le16 (inode->i_nlink); - raw_inode->i_size =cpu_to_le32 (ei->i_disksize); + disksize =cpu_to_le32 (ei->i_disksize); +if (disksize != raw_inode->i_size) { + need_datasync =1 ; + raw_inode->i_size = disksize; + } raw_inode->i_atime =cpu_to_le32 (inode->i_atime.tv_sec); raw_inode->i_ctime =cpu_to_le32 (inode->i_ctime.tv_sec); raw_inode->i_mtime =cpu_to_le32 (inode->i_mtime.tv_sec);
@@ -3066,8 +3072,11 @@ again:if (!S_ISREG (inode->i_mode)) { raw_inode->i_dir_acl =cpu_to_le32 (ei->i_dir_acl); } else { - raw_inode->i_size_high = - cpu_to_le32(ei->i_disksize >> 32); + disksize = cpu_to_le32(ei->i_disksize >> 32); + if (disksize != raw_inode->i_size_high) { + raw_inode->i_size_high = disksize; + need_datasync = 1; + } if (ei->i_disksize > 0x7fffffffULL) { struct super_block *sb = inode->i_sb; if (!EXT3_HAS_RO_COMPAT_FEATURE(sb,
@@ -3120,6 +3129,8 @@ again:ext3_clear_inode_state (inode,EXT3_STATE_NEW );atomic_set (&ei->i_sync_tid, handle->h_transaction->t_tid); +if (need_datasync) +atomic_set (&ei->i_datasync_tid, handle->h_transaction->t_tid); out_brelse:brelse (bh);ext3_std_error (inode->i_sb, err);
fs/fuse/dev.c +1 -0
@@ -1524,6 +1524,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode, req->pages[req->num_pages] = page; req->num_pages++; + offset =0 ; num -= this_num; total_len += this_num; index++;
fs/nfs/nfs3proc.c +1 -1
@@ -68,7 +68,7 @@ do_proc_get_root(struct rpc_clnt *client, struct nfs_fh *fhandle,nfs_fattr_init (info->fattr); status =rpc_call_sync (client, &msg,0 );dprintk ("%s: reply fsinfo: %d\n" , __func__, status); -if (!(info->fattr->valid &NFS_ATTR_FATTR )) { +if (status ==0 && !(info->fattr->valid &NFS_ATTR_FATTR )) { msg.rpc_proc = &nfs3_procedures[NFS3PROC_GETATTR ]; msg.rpc_resp = info->fattr; status =rpc_call_sync (client, &msg,0 );
fs/nfs/nfs4proc.c +2 -6
@@ -5766,12 +5766,8 @@ static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata)return ; }spin_lock (&lo->plh_inode->i_lock); -if (task->tk_status ==0 ) { -if (lrp->res.lrs_present) { -pnfs_set_layout_stateid (lo, &lrp->res.stateid, true); - }else -BUG_ON (!list_empty (&lo->plh_segs)); - } +if (task->tk_status ==0 && lrp->res.lrs_present) +pnfs_set_layout_stateid (lo, &lrp->res.stateid, true); lo->plh_block_lgets--;spin_unlock (&lo->plh_inode->i_lock);dprintk ("<-- %s\n" , __func__);
fs/nfs/super.c +2 -0
@@ -3096,4 +3096,6 @@ static struct dentry *nfs4_referral_mount(struct file_system_type *fs_type, return res; } +MODULE_ALIAS ("nfs4" ); +#endif /* CONFIG_NFS_V4 */
fs/open.c +4 -3
@@ -900,9 +900,10 @@ static inline int build_open_flags(int flags, int mode, struct open_flags *op)int lookup_flags =0 ;int acc_mode; -if (!(flags &O_CREAT )) - mode =0 ; - op->mode = mode; +if (flags &O_CREAT ) + op->mode = (mode &S_IALLUGO ) |S_IFREG ; +else + op->mode =0 ;/* Must never be set by userspace */ flags &= ~FMODE_NONOTIFY ;
fs/udf/file.c +29 -6
@@ -39,20 +39,24 @@#include "udf_i.h" #include "udf_sb.h" -static int udf_adinicb_readpage (struct file *file,struct page *page) +static void __udf_adinicb_readpage (struct page *page) {struct inode *inode = page->mapping->host;char *kaddr;struct udf_inode_info *iinfo =UDF_I (inode); -BUG_ON (!PageLocked (page)); - kaddr =kmap (page); -memset (kaddr,0 ,PAGE_CACHE_SIZE );memcpy (kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, inode->i_size); +memset (kaddr + inode->i_size,0 ,PAGE_CACHE_SIZE - inode->i_size);flush_dcache_page (page);SetPageUptodate (page);kunmap (page); +} + +static int udf_adinicb_readpage (struct file *file,struct page *page) +{ +BUG_ON (!PageLocked (page)); +__udf_adinicb_readpage (page);unlock_page (page);return 0 ;
@@ -77,6 +81,25 @@ static int udf_adinicb_writepage(struct page *page,return 0 ; } +static int udf_adinicb_write_begin (struct file *file, +struct address_space *mapping,loff_t pos, +unsigned len,unsigned flags,struct page **pagep, +void **fsdata) +{ +struct page *page; + +if (WARN_ON_ONCE (pos >=PAGE_CACHE_SIZE )) +return -EIO ; + page =grab_cache_page_write_begin (mapping,0 , flags); +if (!page) +return -ENOMEM ; + *pagep = page; + +if (!PageUptodate (page) && len !=PAGE_CACHE_SIZE ) +__udf_adinicb_readpage (page); +return 0 ; +} + static int udf_adinicb_write_end(struct file *file, struct address_space *mapping, loff_t pos, unsigned len, unsigned copied,
@@ -98,8 +121,8 @@ static int udf_adinicb_write_end(struct file *file,const struct address_space_operations udf_adinicb_aops = { .readpage = udf_adinicb_readpage, .writepage = udf_adinicb_writepage, - .write_begin = simple_write_begin, - .write_end = udf_adinicb_write_end, + .write_begin = udf_adinicb_write_begin, + .write_end = udf_adinicb_write_end, }; static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
kernel/audit_tree.c +5 -6
@@ -256,7 +256,6 @@ static void untag_chunk(struct node *p)spin_unlock (&hash_lock);spin_unlock (&entry->lock);fsnotify_destroy_mark (entry); -fsnotify_put_mark (entry); goto out; }
@@ -265,7 +264,7 @@ static void untag_chunk(struct node *p)fsnotify_duplicate_mark (&new->mark, entry);if (fsnotify_add_mark (&new->mark, new->mark.group, new->mark.i.inode,NULL ,1 )) { -free_chunk (new); +fsnotify_put_mark (&new->mark); goto Fallback; }
@@ -299,7 +298,6 @@ static void untag_chunk(struct node *p)spin_unlock (&hash_lock);spin_unlock (&entry->lock);fsnotify_destroy_mark (entry); -fsnotify_put_mark (entry); goto out; Fallback:
@@ -328,7 +326,7 @@ static int create_chunk(struct inode *inode, struct audit_tree *tree) entry = &chunk->mark;if (fsnotify_add_mark (entry, audit_tree_group, inode,NULL ,0 )) { -free_chunk (chunk); +fsnotify_put_mark (entry);return -ENOSPC ; }
@@ -338,6 +336,7 @@ static int create_chunk(struct inode *inode, struct audit_tree *tree)spin_unlock (&hash_lock); chunk->dead =1 ;spin_unlock (&entry->lock); +fsnotify_get_mark (entry);fsnotify_destroy_mark (entry);fsnotify_put_mark (entry);return 0 ;
@@ -402,7 +401,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)fsnotify_duplicate_mark (chunk_entry, old_entry);if (fsnotify_add_mark (chunk_entry, chunk_entry->group, chunk_entry->i.inode,NULL ,1 )) {spin_unlock (&old_entry->lock); -free_chunk (chunk); +fsnotify_put_mark (chunk_entry);fsnotify_put_mark (old_entry);return -ENOSPC ; }
@@ -418,6 +417,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)spin_unlock (&chunk_entry->lock);spin_unlock (&old_entry->lock); +fsnotify_get_mark (chunk_entry);fsnotify_destroy_mark (chunk_entry);fsnotify_put_mark (chunk_entry);
@@ -451,7 +451,6 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)spin_unlock (&old_entry->lock);fsnotify_destroy_mark (old_entry);fsnotify_put_mark (old_entry);/* pair to fsnotify_find mark_entry */ -fsnotify_put_mark (old_entry);/* and kill it */ return 0 ; }
mm/mempolicy.c +1 -1
@@ -2500,7 +2500,7 @@ int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, int no_context)break ;default : -BUG (); +return -EINVAL ; } l =strlen (policy_modes[mode]);
net/dccp/ccid.h +2 -2
@@ -246,7 +246,7 @@ static inline int ccid_hc_rx_getsockopt(struct ccid *ccid, struct sock *sk, u32 __user *optval, int __user *optlen) {int rc = -ENOPROTOOPT ; -if (ccid->ccid_ops->ccid_hc_rx_getsockopt !=NULL ) +if (ccid !=NULL && ccid->ccid_ops->ccid_hc_rx_getsockopt !=NULL ) rc = ccid->ccid_ops->ccid_hc_rx_getsockopt (sk, optname, len, optval, optlen);return rc;
@@ -257,7 +257,7 @@ static inline int ccid_hc_tx_getsockopt(struct ccid *ccid, struct sock *sk, u32 __user *optval, int __user *optlen) {int rc = -ENOPROTOOPT ; -if (ccid->ccid_ops->ccid_hc_tx_getsockopt !=NULL ) +if (ccid !=NULL && ccid->ccid_ops->ccid_hc_tx_getsockopt !=NULL ) rc = ccid->ccid_ops->ccid_hc_tx_getsockopt (sk, optname, len, optval, optlen);return rc;
net/sunrpc/svc_xprt.c +4 -6
@@ -323,7 +323,6 @@ static bool svc_xprt_has_something_to_do(struct svc_xprt *xprt)*/ void svc_xprt_enqueue (struct svc_xprt *xprt) { -struct svc_serv *serv = xprt->xpt_server;struct svc_pool *pool;struct svc_rqst *rqstp;int cpu;
@@ -369,8 +368,6 @@ void svc_xprt_enqueue(struct svc_xprt *xprt) rqstp, rqstp->rq_xprt); rqstp->rq_xprt = xprt;svc_xprt_get (xprt); - rqstp->rq_reserved = serv->sv_max_mesg; -atomic_add (rqstp->rq_reserved, &xprt->xpt_reserved); pool->sp_stats.threads_woken++;wake_up (&rqstp->rq_wait); }else {
@@ -650,8 +647,6 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)if (xprt) { rqstp->rq_xprt = xprt;svc_xprt_get (xprt); - rqstp->rq_reserved = serv->sv_max_mesg; -atomic_add (rqstp->rq_reserved, &xprt->xpt_reserved);/* As there is a shortage of threads and this request * had to be queued, don't allow the thread to wait so
@@ -748,6 +743,8 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)else len = xprt->xpt_ops->xpo_recvfrom (rqstp);dprintk ("svc: got len=%d\n" , len); + rqstp->rq_reserved = serv->sv_max_mesg; +atomic_add (rqstp->rq_reserved, &xprt->xpt_reserved); }svc_xprt_received (xprt);
@@ -804,7 +801,8 @@ int svc_send(struct svc_rqst *rqstp)/* Grab mutex to serialize outgoing data. */ mutex_lock (&xprt->xpt_mutex); -if (test_bit (XPT_DEAD , &xprt->xpt_flags)) +if (test_bit (XPT_DEAD , &xprt->xpt_flags) + ||test_bit (XPT_CLOSE , &xprt->xpt_flags)) len = -ENOTCONN ;else len = xprt->xpt_ops->xpo_sendto (rqstp);
net/sunrpc/svcsock.c +1 -1
@@ -1122,9 +1122,9 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)if (len >=0 ) svsk->sk_tcplen += len;if (len != want) { +svc_tcp_save_pages (svsk, rqstp);if (len <0 && len != -EAGAIN ) goto err_other; -svc_tcp_save_pages (svsk, rqstp);dprintk ("svc: incomplete TCP record (%d of %d)\n" , svsk->sk_tcplen, svsk->sk_reclen); goto err_noclose;
sound/pci/hda/hda_proc.c +1 -1
@@ -406,7 +406,7 @@ static void print_digital_conv(struct snd_info_buffer *buffer,if (digi1 &AC_DIG1_EMPHASIS )snd_iprintf (buffer," Preemphasis" );if (digi1 &AC_DIG1_COPYRIGHT ) -snd_iprintf (buffer," Copyright" ); +snd_iprintf (buffer," Non-Copyright" );if (digi1 &AC_DIG1_NONAUDIO )snd_iprintf (buffer," Non-Audio" );if (digi1 &AC_DIG1_PROFESSIONAL )
sound/soc/codecs/wm9712.c +17 -2
@@ -270,7 +270,7 @@ SOC_DAPM_ENUM("Route", wm9712_enum[9]);/* Mic select */ static const struct snd_kcontrol_new wm9712_mic_src_controls = -SOC_DAPM_ENUM ("Route" , wm9712_enum[7 ]); +SOC_DAPM_ENUM ("Mic Source Select" , wm9712_enum[7 ]);/* diff select */ static const struct snd_kcontrol_new wm9712_diff_sel_controls =
@@ -289,7 +289,9 @@ SND_SOC_DAPM_MUX("Left Capture Select", SND_SOC_NOPM, 0, 0, &wm9712_capture_selectl_controls),SND_SOC_DAPM_MUX ("Right Capture Select" ,SND_SOC_NOPM ,0 ,0 , &wm9712_capture_selectr_controls), -SND_SOC_DAPM_MUX ("Mic Select Source" ,SND_SOC_NOPM ,0 ,0 , +SND_SOC_DAPM_MUX ("Left Mic Select Source" ,SND_SOC_NOPM ,0 ,0 , + &wm9712_mic_src_controls), +SND_SOC_DAPM_MUX ("Right Mic Select Source" ,SND_SOC_NOPM ,0 ,0 , &wm9712_mic_src_controls),SND_SOC_DAPM_MUX ("Differential Source" ,SND_SOC_NOPM ,0 ,0 , &wm9712_diff_sel_controls),
@@ -317,6 +319,7 @@ SND_SOC_DAPM_PGA("Out 3 PGA", AC97_INT_PAGING, 5, 1, NULL, 0),SND_SOC_DAPM_PGA ("Line PGA" ,AC97_INT_PAGING ,2 ,1 ,NULL ,0 ),SND_SOC_DAPM_PGA ("Phone PGA" ,AC97_INT_PAGING ,1 ,1 ,NULL ,0 ),SND_SOC_DAPM_PGA ("Mic PGA" ,AC97_INT_PAGING ,0 ,1 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("Differential Mic" ,SND_SOC_NOPM ,0 ,0 ,NULL ,0 ),SND_SOC_DAPM_MICBIAS ("Mic Bias" ,AC97_INT_PAGING ,10 ,1 ),SND_SOC_DAPM_OUTPUT ("MONOOUT" ), SND_SOC_DAPM_OUTPUT("HPOUTL"),
@@ -377,6 +380,18 @@ static const struct snd_soc_dapm_route wm9712_audio_map[] = { {"Mic PGA", NULL, "MIC1"}, {"Mic PGA", NULL, "MIC2"}, +/* microphones */ + {"Differential Mic", NULL, "MIC1"}, + {"Differential Mic", NULL, "MIC2"}, + {"Left Mic Select Source", "Mic 1", "MIC1"}, + {"Left Mic Select Source", "Mic 2", "MIC2"}, + {"Left Mic Select Source", "Stereo", "MIC1"}, + {"Left Mic Select Source", "Differential", "Differential Mic"}, + {"Right Mic Select Source", "Mic 1", "MIC1"}, + {"Right Mic Select Source", "Mic 2", "MIC2"}, + {"Right Mic Select Source", "Stereo", "MIC2"}, + {"Right Mic Select Source", "Differential", "Differential Mic"}, +/* left capture selector */ {"Left Capture Select", "Mic", "MIC1"}, {"Left Capture Select", "Speaker Mixer", "Speaker Mixer"},