Linux 3.4.83
Greg KH
maintainerI'm announcing the release of the 3.4.83 kernel.
All users of the 3.4 kernel series must upgrade.
The updated 3.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.4.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/arm/include/asm/cacheflush.h | 1 arch/arm/mm/proc-v6.S | 3 arch/arm/mm/proc-v7.S | 2 arch/avr32/Makefile | 2 arch/avr32/boards/mimc200/fram.c | 1 arch/powerpc/kernel/crash_dump.c | 8 arch/powerpc/kvm/emulate.c | 2 arch/s390/kvm/kvm-s390.c | 14 - arch/x86/kernel/cpu/perf_event.c | 3 arch/x86/xen/enlighten.c | 4 arch/x86/xen/smp.c | 2 block/blk-exec.c | 12 drivers/acpi/processor_throttling.c | 69 ++--- drivers/acpi/video.c | 8 drivers/ata/libata-pmp.c | 7 drivers/ata/sata_sil.c | 1 drivers/block/nbd.c | 8 drivers/block/xen-blkback/blkback.c | 13 drivers/block/xen-blkback/common.h | 2 drivers/block/xen-blkback/xenbus.c | 2 drivers/connector/cn_proc.c | 8 drivers/dma/ste_dma40.c | 4 drivers/edac/i7core_edac.c | 9 drivers/hwmon/max1668.c | 2 drivers/md/dm-mpath.c | 7 drivers/media/video/saa7134/saa7134-alsa.c | 2 drivers/net/bonding/bond_3ad.c | 6 drivers/net/bonding/bond_3ad.h | 1 drivers/net/ethernet/broadcom/tg3.c | 4 drivers/net/usb/asix.c | 128 +++++++-- drivers/net/usb/gl620a.c | 4 drivers/net/usb/mcs7830.c | 5 drivers/net/usb/net1080.c | 4 drivers/net/usb/qmi_wwan.c | 8 drivers/net/usb/rndis_host.c | 4 drivers/net/usb/smsc75xx.c | 4 drivers/net/usb/smsc95xx.c | 4 drivers/net/usb/usbnet.c | 25 - drivers/net/wireless/iwlwifi/iwl-6000.c | 6 drivers/net/wireless/iwlwifi/iwl-agn.c | 2 drivers/net/wireless/iwlwifi/iwl-cfg.h | 1 drivers/net/wireless/iwlwifi/iwl-core.c | 5 drivers/net/wireless/iwlwifi/iwl-debugfs.c | 3 drivers/net/wireless/iwlwifi/iwl-pci.c | 10 drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h | 11 drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 37 ++ drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 65 ++++ drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 27 +- drivers/net/wireless/rtl818x/rtl8187/rtl8187.h | 10 drivers/net/wireless/rtlwifi/base.c | 89 +++--- drivers/net/wireless/rtlwifi/ps.c | 2 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 18 + drivers/net/wireless/rtlwifi/wifi.h | 6 drivers/net/xen-netback/netback.c | 289 +++++++++++++++++----- drivers/staging/line6/pcm.c | 5 drivers/usb/serial/ftdi_sio.c | 2 drivers/usb/serial/ftdi_sio_ids.h | 6 drivers/usb/serial/option.c | 3 drivers/xen/events.c | 11 fs/cifs/file.c | 37 ++ fs/cifs/readdir.c | 8 fs/cifs/transport.c | 7 fs/ext4/ext4.h | 2 fs/ext4/extents.c | 25 + fs/ext4/fsync.c | 3 fs/ext4/indirect.c | 9 fs/ext4/inode.c | 14 - fs/ext4/mmp.c | 2 fs/ext4/page-io.c | 9 fs/ext4/resize.c | 10 fs/ext4/super.c | 20 - fs/ext4/xattr.c | 3 fs/fuse/dir.c | 9 fs/fuse/file.c | 8 fs/fuse/fuse_i.h | 9 fs/fuse/inode.c | 4 fs/jbd2/journal.c | 31 ++ fs/ncpfs/dir.c | 9 fs/nilfs2/page.c | 2 fs/nilfs2/segment.c | 11 fs/quota/dquot.c | 14 - fs/ubifs/orphan.c | 5 fs/ubifs/ubifs.h | 2 include/linux/cgroup.h | 53 +++- include/linux/jbd2.h | 1 include/linux/nbd.h | 1 include/linux/skbuff.h | 19 + include/xen/interface/io/netif.h | 18 + include/xen/interface/io/ring.h | 5 kernel/cgroup.c | 50 +-- kernel/cgroup_freezer.c | 13 kernel/events/core.c | 12 kernel/fork.c | 9 kernel/workqueue.c | 7 mm/memory_hotplug.c | 15 - mm/vmscan.c | 27 +- net/ceph/osd_client.c | 2 net/core/fib_rules.c | 7 net/core/skbuff.c | 25 + net/ipv4/ip_forward.c | 68 +++++ net/ipv6/ip6_output.c | 13 net/sctp/socket.c | 41 ++- net/sunrpc/sched.c | 13 net/sunrpc/xprtsock.c | 6 security/selinux/ss/policydb.c | 8 sound/arm/pxa2xx-pcm-lib.c | 2 sound/pci/asihpi/asihpi.c | 3 sound/pci/atiixp.c | 2 sound/pci/atiixp_modem.c | 2 sound/soc/codecs/sgtl5000.c | 2 sound/soc/codecs/sta32x.c | 74 ++--- sound/soc/codecs/wm8770.c | 4 sound/soc/codecs/wm8958-dsp2.c | 2 sound/soc/imx/imx-ssi.c | 5 sound/soc/s6000/s6000-pcm.c | 2 sound/usb/6fire/pcm.c | 12 sound/usb/misc/ua101.c | 14 - sound/usb/mixer_maps.c | 9 sound/usb/usx2y/usbusx2yaudio.c | 4 tools/perf/util/parse-events.c | 2 virt/kvm/iommu.c | 4 122 files changed, 1341 insertions(+), 471 deletions(-)
Adam Thomas (1):
UBIFS: fix double free of ubifs_orphan objects
Aleksander Morgado (1):
USB: serial: option: blacklist interface 4 for Cinterion PHS8 and PXS8
Alexander Graf (1):
KVM: PPC: Emulate dcbf
Arnaldo Carvalho de Melo (1):
perf tools: Remove extraneous newline when parsing hardware cache events
Chen Gang (1):
avr32: Makefile: add '-D__linux__' flag for gcc-4.4.7 use
Christian Borntraeger (1):
s390/kvm: dont announce RRBM support
Clemens Ladisch (1):
ALSA: usb-audio: work around KEF X300A firmware bug
Daniel Borkmann (1):
net: sctp: fix sctp_connectx abi for ia32 emulation/compat mode
Dave Chiluk (1):
ncpfs: fix rmdir returns Device or resource busy
David Vrabel (1):
xen/events: mask events when changing their VCPU binding
Denis V. Lunev (1):
ata: enable quirk from jmicron JMB350 for JMB394
Dominik Dingel (1):
KVM: s390: move kvm_guest_enter,exit closer to sie
Emil Goode (2):
usbnet: remove generic hard_header_len check
net: asix: add missing flag to struct driver_info
Emmanuel Grumbach (2):
iwlwifi: don't handle masked interrupt
iwlwifi: pcie: add SKUs for 6000, 6005 and 6235 series
Eric Paris (1):
SELinux: bigendian problems with filename trans rules
Fabio Estevam (1):
ASoC: sglt5000: Fix the default value of CHIP_SSS_CTRL
Florian Westphal (2):
net: add and use skb_gso_transport_seglen()
net: ip, ipv6: handle gso skbs in forwarding path
Greg Edwards (1):
KVM: IOMMU: hva align mapping page size
Greg Kroah-Hartman (1):
Linux 3.4.83
Guenter Roeck (1):
hwmon: (max1668) Fix writing the minimum temperature
Hannes Reinecke (1):
dm mpath: fix stalls when handling invalid ioctls
Hans de Goede (1):
ACPI / video: Filter the _BCL table for duplicate brightness values
Jan Beulich (1):
xen/io/ring.h: new macro to detect whether there are too many requests on the ring
Jan Kara (2):
quota: Fix race between dqput() and dquot_scan_active()
ext4: fix possible use-after-free with AIO
Jean Delvare (1):
i7core_edac: Fix PCI device reference count
Jeff Layton (4):
cifs: ensure that uncached writes handle unmapped areas correctly
cifs: don't instantiate new dentries in readdir for inodes that need to be revalidated immediately
cifs: adjust sequence number downward after signing NT_CANCEL request
sunrpc: clarify comments on rpc_make_runnable
Jiang Liu (1):
mm/hotplug: correctly add new zone to all other nodes' zone lists
Jiri Bohac (1):
bonding: 802.3ad: make aggregator_identifier bond-private
Jiri Olsa (1):
perf tools: Fix cache event name generation
Joerg Dorchain (1):
USB: ftdi_sio: add Cressi Leonardo PID
Johannes Berg (5):
iwlwifi: fix flow handler debug code
iwlwifi: protect SRAM debugfs
iwlwifi: handle DMA mapping failures
iwlwifi: always copy first 16 bytes of commands
iwlwifi: dvm: don't send BT_CONFIG on devices w/o Bluetooth
Johannes Weiner (1):
mm: vmscan: fix endless loop in kswapd balancing
Kees Cook (1):
proc connector: reject unprivileged listener bumps
Konrad Rzeszutek Wilk (4):
xen/boot: Disable BIOS SMP MP table search.
xen/smp: Fix leakage of timer interrupt line for every CPU online/offline. xen/smp/spinlock: Fix leakage of the spinlock interrupt line for every CPU online/offline xen/blkback: Check for insane amounts of request on the ring (v6).
Lai Jiangshan (1):
workqueue: ensure @task is valid across kthread_stop()
Lan Tianyu (1):
ACPI / processor: Rework processor throttling with work_on_cpu()
Lars-Peter Clausen (1):
ASoC: wm8958-dsp: Fix firmware block loading
Laurent Dufour (1):
powerpc/crashdump : Fix page frame number check in copy_oldmem_page
Linus Walleij (1):
dma: ste_dma40: don't dereference free:d descriptor
Lucas Stach (1):
net: asix: handle packets crossing URB boundaries
Maciej Żenczykowski (1):
net: fix 'ip rule' iif/oif device rename
Mark Cave-Ayland (1):
rtlwifi: Fix endian error in extracting packet type
Maxim Patlasov (1):
fuse: hotfix truncate_pagecache() issue
Miklos Szeredi (1):
fuse: readdir: check for slash in names
Nithin Sujir (1):
tg3: Fix deadlock in tg3_change_mtu()
Olivier Langlois (2):
rtlwifi: Fix incorrect return from rtl_ps_enable_nic()
rtlwifi: rtl8192ce: Fix too long disable of IRQs
Paul Clements (1):
nbd: correct disconnect behavior
Paul Gortmaker (1):
avr32: fix missing module.h causing build failure in mimc200/fram.c
Peter Zijlstra (2):
perf/x86: Fix event scheduling
perf: Fix hotplug splat
Roland Dreier (1):
block: Don't access request after it might be freed
Sascha Hauer (1):
ASoC: imx-ssi: Fix occasional AC97 reset failure
Stanislaw Gruszka (2):
rtl8187: fix regression on MIPS without coherent DMA
iwlwifi: dvm: fix calling ieee80211_chswitch_done() with NULL
Takashi Iwai (12):
ASoC: wm8770: Fix wrong number of enum items
ASoC: sta32x: Fix wrong enum for limiter2 release rate
ASoC: sta32x: Fix array access overflow
saa7134: Fix unlocked snd_pcm_stop() call
ALSA: atiixp: Fix unlocked snd_pcm_stop() call
ALSA: 6fire: Fix unlocked snd_pcm_stop() call
ALSA: ua101: Fix unlocked snd_pcm_stop() call
ALSA: usx2y: Fix unlocked snd_pcm_stop() call
ALSA: pxa2xx: Fix unlocked snd_pcm_stop() call
ASoC: s6000: Fix unlocked snd_pcm_stop() call
staging: line6: Fix unlocked snd_pcm_stop() call
ALSA: asihpi: Fix unlocked snd_pcm_stop() call
Tejun Heo (3):
sata_sil: apply MOD15WRITE quirk to TOSHIBA MK2561GSYN
cgroup: cgroup_subsys->fork() should be called after the task is added to css_set
cgroup: fix RCU accesses to task->cgroupsTheodore Ts'o (5):
ext4: don't try to modify s_flags if the the file system is read-only
ext4: fix online resize with a non-standard blocks per group setting
ext4: don't leave i_crtime.tv_sec uninitialized ext4/jbd2: don't wait (forever) for stale tid caused by wraparound
ext4: return ENOMEM if sb_getblk() fails
Trond Myklebust (2):
SUNRPC: Fix races in xs_nospace()
SUNRPC: Prevent an rpc_task wakeup race
Vinayak Kale (1):
ARM: 7957/1: add DSB after icache flush in __flush_icache_all()
Vyacheslav Dubeyko (1):
nilfs2: fix issue with race condition of competition between segments for dirty blocks
Wei Liu (2):
xen-netback: coalesce slots in TX path and fix regressions
xen-netback: don't disconnect frontend when seeing oversize packet
Will Deacon (1):
ARM: 7953/1: mm: ensure TLB invalidation is complete before enabling MMU
majianpeng (1):
libceph: unregister request in __map_request failed and nofail == false
stephen hemminger (1):
xen-netback: fix sparse warning
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 82 +SUBLEVEL = 83 EXTRAVERSION = NAME = Saber-toothed Squirrel
arch/arm/include/asm/cacheflush.h +1 -0
@@ -202,6 +202,7 @@ extern void copy_to_user_page(struct vm_area_struct *, struct page *,static inline void __flush_icache_all (void ) {__flush_icache_preferred (); +dsb (); }#define flush_cache_all () __cpuc_flush_kern_all()
arch/arm/mm/proc-v6.S +2 -1
@@ -202,7 +202,6 @@ __v6_setup: mcr p15, 0, r0, c7, c14, 0 @ clean+invalidate D cache mcr p15, 0, r0, c7, c5, 0 @ invalidate I cache mcr p15, 0, r0, c7, c15, 0 @ clean+invalidate cache - mcr p15, 0, r0, c7, c10, 4 @ drain write buffer #ifdef CONFIG_MMU mcr p15, 0, r0, c8, c7, 0 @ invalidate I + D TLBs mcr p15, 0, r0, c2, c0, 2 @ TTB control register
@@ -212,6 +211,8 @@ __v6_setup: ALT_UP(orr r8, r8, #TTB_FLAGS_UP) mcr p15, 0, r8, c2, c0, 1 @ load TTB1 #endif /* CONFIG_MMU */ + mcr p15, 0, r0, c7, c10, 4 @ drain write buffer and + @ complete invalidations adr r5, v6_crval ldmia r5, {r5, r6} #ifdef CONFIG_CPU_ENDIAN_BE8
arch/arm/mm/proc-v7.S +1 -1
@@ -246,7 +246,6 @@ __v7_setup: 3: mov r10, #0 mcr p15, 0, r10, c7, c5, 0 @ I+BTB cache invalidate - dsb #ifdef CONFIG_MMU mcr p15, 0, r10, c8, c7, 0 @ invalidate I + D TLBs v7_ttb_setup r10, r4, r8, r5 @ TTBCR, TTBRx setup
@@ -255,6 +254,7 @@ __v7_setup: mcr p15, 0, r5, c10, c2, 0 @ write PRRR mcr p15, 0, r6, c10, c2, 1 @ write NMRR #endif + dsb @ Complete invalidations #ifndef CONFIG_ARM_THUMBEE mrc p15, 0, r0, c0, c1, 0 @ read ID_PFR0 for ThumbEE and r0, r0, #(0xf << 12) @ ThumbEE enabled field
arch/avr32/Makefile +1 -1
@@ -11,7 +11,7 @@ all: uImage vmlinux.elf KBUILD_DEFCONFIG := atstk1002_defconfig -KBUILD_CFLAGS += -pipe -fno-builtin -mno-pic +KBUILD_CFLAGS += -pipe -fno-builtin -mno-pic -D__linux__ KBUILD_AFLAGS += -mrelax -mno-pic KBUILD_CFLAGS_MODULE += -mno-relax LDFLAGS_vmlinux += --relax
arch/avr32/boards/mimc200/fram.c +1 -0
@@ -11,6 +11,7 @@#define FRAM_VERSION "1.0"#include <linux/miscdevice.h> +#include <linux/module.h> #include <linux/proc_fs.h> #include <linux/mm.h> #include <linux/io.h>
arch/powerpc/kernel/crash_dump.c +5 -3
@@ -108,17 +108,19 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf, size_t csize, unsigned long offset, int userbuf) { void *vaddr; +phys_addr_t paddr;if (!csize)return 0 ; csize =min_t (size_t, csize,PAGE_SIZE ); + paddr = pfn <<PAGE_SHIFT ; -if ((min_low_pfn < pfn) && (pfn < max_pfn)) { - vaddr =__va (pfn <<PAGE_SHIFT ); +if (memblock_is_region_memory (paddr, csize)) { + vaddr =__va (paddr); csize =copy_oldmem_vaddr (vaddr, buf, csize, offset, userbuf); }else { - vaddr =__ioremap (pfn <<PAGE_SHIFT ,PAGE_SIZE ,0 ); + vaddr =__ioremap (paddr,PAGE_SIZE ,0 ); csize =copy_oldmem_vaddr (vaddr, buf, csize, offset, userbuf);iounmap (vaddr); }
arch/powerpc/kvm/emulate.c +2 -0
@@ -36,6 +36,7 @@#define OP_TRAP_64 2#define OP_31_XOP_LWZX 23 +#define OP_31_XOP_DCBF 86#define OP_31_XOP_LBZX 87#define OP_31_XOP_STWX 151#define OP_31_XOP_STBX 215
@@ -373,6 +374,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)kvmppc_set_exit_type (vcpu,EMULATED_MTSPR_EXITS );break ; +case OP_31_XOP_DCBF :case OP_31_XOP_DCBI :/* Do nothing. The guest is performing dcbi because * hardware DMA is not snooped by the dcache, but
arch/s390/kvm/kvm-s390.c +8 -6
@@ -525,13 +525,18 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)if (!kvm_is_ucontrol (vcpu->kvm))kvm_s390_deliver_pending_interrupts (vcpu); +VCPU_EVENT (vcpu,6 ,"entering sie flags %x" , +atomic_read (&vcpu->arch.sie_block->cpuflags)); + vcpu->arch.sie_block->icptcode =0 ;local_irq_disable ();kvm_guest_enter ();local_irq_enable (); -VCPU_EVENT (vcpu,6 ,"entering sie flags %x" , -atomic_read (&vcpu->arch.sie_block->cpuflags)); rc =sie64a (vcpu->arch.sie_block, vcpu->run->s.regs.gprs); +local_irq_disable (); +kvm_guest_exit (); +local_irq_enable (); +if (rc) {if (kvm_is_ucontrol (vcpu->kvm)) { rc =SIE_INTERCEPT_UCONTROL ;
@@ -543,9 +548,6 @@ static int __vcpu_run(struct kvm_vcpu *vcpu) }VCPU_EVENT (vcpu,6 ,"exit sie icptcode %d" , vcpu->arch.sie_block->icptcode); -local_irq_disable (); -kvm_guest_exit (); -local_irq_enable ();memcpy (&vcpu->run->s.regs.gprs[14 ], &vcpu->arch.sie_block->gg14,16 );return rc;
@@ -902,7 +904,7 @@ static int __init kvm_s390_init(void) }memcpy (facilities, S390_lowcore.stfle_fac_list,16 ); facilities[0 ] &=0xff00fff3f47c0000ULL ; - facilities[1 ] &=0x201c000000000000ULL ; + facilities[1 ] &=0x001c000000000000ULL ;return 0 ; }
arch/x86/kernel/cpu/perf_event.c +3 -0
@@ -1165,6 +1165,9 @@ static void x86_pmu_del(struct perf_event *event, int flags)for (i =0 ; i < cpuc->n_events; i++) {if (event == cpuc->event_list[i]) { +if (i >= cpuc->n_events - cpuc->n_added) + --cpuc->n_added; +if (x86_pmu.put_event_constraints) x86_pmu.put_event_constraints (cpuc, event);
arch/x86/xen/enlighten.c +4 -0
@@ -1448,6 +1448,10 @@ asmlinkage void __init xen_start_kernel(void)/* Make sure ACS will be enabled */ pci_request_acs (); + +/* Avoid searching for BIOS MP tables */ + x86_init.mpparse.find_smp_config = x86_init_noop; + x86_init.mpparse.get_smp_config = x86_init_uint_noop; }#ifdef CONFIG_PCI /* PCI BIOS service won't work from a PV guest. */
arch/x86/xen/smp.c +2 -0
@@ -576,6 +576,8 @@ static void xen_hvm_cpu_die(unsigned int cpu)unbind_from_irqhandler (per_cpu (xen_callfunc_irq, cpu),NULL );unbind_from_irqhandler (per_cpu (xen_debug_irq, cpu),NULL );unbind_from_irqhandler (per_cpu (xen_callfuncsingle_irq, cpu),NULL ); +xen_uninit_lock_cpu (cpu); +xen_teardown_timer (cpu);native_cpu_die (cpu); }
block/blk-exec.c +11 -1
@@ -49,8 +49,18 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, rq_end_io_fn *done) {int where = at_head ?ELEVATOR_INSERT_FRONT :ELEVATOR_INSERT_BACK ; +bool is_pm_resume;WARN_ON (irqs_disabled ()); + + rq->rq_disk = bd_disk; + rq->end_io = done; +/* +* need to check this before __blk_run_queue(), because rq can +* be freed before that returns. +*/ + is_pm_resume = rq->cmd_type ==REQ_TYPE_PM_RESUME ; +spin_lock_irq (q->queue_lock);if (unlikely (blk_queue_dead (q))) {
@@ -66,7 +76,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,__elv_add_request (q, rq, where);__blk_run_queue (q);/* the queue is stopped so it won't be run */ -if (rq->cmd_type ==REQ_TYPE_PM_RESUME ) +if (is_pm_resume) q->request_fn (q);spin_unlock_irq (q->queue_lock); }
drivers/acpi/processor_throttling.c +32 -37
136 lines not on this page · raw message
drivers/acpi/video.c +7 -1
@@ -632,6 +632,7 @@ acpi_video_init_brightness(struct acpi_video_device *device)union acpi_object *o;struct acpi_video_device_brightness *br =NULL ;int result = -EINVAL ; +u32 value;if (!ACPI_SUCCESS (acpi_video_device_lcd_query_levels (device, &obj))) { ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Could not query available "
@@ -662,7 +663,12 @@ acpi_video_init_brightness(struct acpi_video_device *device) printk(KERN_ERR PREFIX "Invalid data\n");continue ; } - br->levels[count] = (u32 ) o->integer.value; + value = (u32 ) o->integer.value; +/* Skip duplicate entries */ +if (count >2 && br->levels[count -1 ] == value) +continue ; + + br->levels[count] = value;if (br->levels[count] > max_level) max_level = br->levels[count];
drivers/ata/libata-pmp.c +5 -2
@@ -447,8 +447,11 @@ static void sata_pmp_quirks(struct ata_port *ap)* otherwise. Don't try hard to recover it. */ ap->pmp_link[ap->nr_pmp_links -1 ].flags |=ATA_LFLAG_NO_RETRY ; - }else if (vendor ==0x197b && devid ==0x2352 ) { -/* chip found in Thermaltake BlackX Duet, jmicron JMB350? */ + }else if (vendor ==0x197b && (devid ==0x2352 || devid ==0x0325 )) { +/* +* 0x2352: found in Thermaltake BlackX Duet, jmicron JMB350? +* 0x0325: jmicron JMB394. +*/ ata_for_each_link (link, ap,EDGE ) {/* SRST breaks detection and disks get misclassified * LPM disabled to avoid potential problems
drivers/ata/sata_sil.c +1 -0
@@ -157,6 +157,7 @@ static const struct sil_drivelist { { "ST380011ASL", SIL_QUIRK_MOD15WRITE }, { "ST3120022ASL", SIL_QUIRK_MOD15WRITE }, { "ST3160021ASL", SIL_QUIRK_MOD15WRITE }, + { "TOSHIBA MK2561GSYN", SIL_QUIRK_MOD15WRITE }, { "Maxtor 4D060H3", SIL_QUIRK_UDMA5MAX }, { } };
drivers/block/nbd.c +7 -1
@@ -590,8 +590,11 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,nbd_cmd (&sreq) =NBD_CMD_DISC ;if (!nbd->sock)return -EINVAL ; + + nbd->disconnect =1 ; +nbd_send_req (nbd, &sreq); -return 0 ; +return 0 ; }case NBD_CLEAR_SOCK : {
@@ -620,6 +623,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, nbd->sock =SOCKET_I (inode);if (max_part >0 ) bdev->bd_invalidated =1 ; + nbd->disconnect =0 ;/* we're connected now */ return 0 ; }else {fput (file);
@@ -691,6 +695,8 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,set_capacity (nbd->disk,0 );if (max_part >0 )ioctl_by_bdev (bdev,BLKRRPART ,0 ); +if (nbd->disconnect)/* user requested, ignore socket errors */ +return 0 ;return nbd->harderror; }
drivers/block/xen-blkback/blkback.c +12 -1
@@ -274,6 +274,7 @@ int xen_blkif_schedule(void *arg) {struct xen_blkif *blkif = arg;struct xen_vbd *vbd = &blkif->vbd; +int ret;xen_blkif_get (blkif);
@@ -294,8 +295,12 @@ int xen_blkif_schedule(void *arg) blkif->waiting_reqs =0 ;smp_mb ();/* clear flag *before* checking for work */ -if (do_block_io_op (blkif)) + ret =do_block_io_op (blkif); +if (ret >0 ) blkif->waiting_reqs =1 ; +if (ret == -EACCES ) +wait_event_interruptible (blkif->shutdown_wq, +kthread_should_stop ());if (log_stats &&time_after (jiffies, blkif->st_print))print_stats (blkif);
@@ -531,6 +536,12 @@ __do_block_io_op(struct xen_blkif *blkif) rp = blk_rings->common.sring->req_prod;rmb ();/* Ensure we see queued requests up to 'rp'. */ +if (RING_REQUEST_PROD_OVERFLOW (&blk_rings->common, rp)) { + rc = blk_rings->common.rsp_prod_pvt; +pr_warn (DRV_PFX "Frontend provided bogus ring requests (%d - %d = %d). Halting ring processing on dev=%04x\n" , + rp, rc, rp - rc, blkif->vbd.pdevice); +return -EACCES ; + }while (rc != rp) {if (RING_REQUEST_CONS_OVERFLOW (&blk_rings->common, rc))
drivers/block/xen-blkback/common.h +2 -0
@@ -216,6 +216,8 @@ struct xen_blkif {int st_wr_sect;wait_queue_head_t waiting_to_free; +/* Thread shutdown wait queue. */ +wait_queue_head_t shutdown_wq; };
drivers/block/xen-blkback/xenbus.c +2 -0
@@ -118,6 +118,7 @@ static struct xen_blkif *xen_blkif_alloc(domid_t domid)atomic_set (&blkif->drain,0 ); blkif->st_print = jiffies;init_waitqueue_head (&blkif->waiting_to_free); +init_waitqueue_head (&blkif->shutdown_wq);return blkif; }
@@ -178,6 +179,7 @@ static void xen_blkif_disconnect(struct xen_blkif *blkif) {if (blkif->xenblkd) {kthread_stop (blkif->xenblkd); +wake_up (&blkif->shutdown_wq); blkif->xenblkd =NULL ; }
drivers/connector/cn_proc.c +8 -0
@@ -331,6 +331,12 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg,if (msg->len !=sizeof (*mc_op))return ; +/* Can only change if privileged. */ +if (!capable (CAP_NET_ADMIN )) { + err =EPERM ; + goto out; + } + mc_op = (enum proc_cn_mcast_op *)msg->data;switch (*mc_op) {case PROC_CN_MCAST_LISTEN :
@@ -343,6 +349,8 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg, err =EINVAL ;break ; } + +out:cn_proc_ack (err, msg->seq, msg->ack); }
drivers/dma/ste_dma40.c +3 -1
@@ -1409,6 +1409,7 @@ static void dma_tasklet(unsigned long data)struct d40_chan *d40c = (struct d40_chan *) data;struct d40_desc *d40d;unsigned long flags; +bool callback_active;dma_async_tx_callback callback;void *callback_param;
@@ -1432,6 +1433,7 @@ static void dma_tasklet(unsigned long data) }/* Callback to client */ + callback_active = !!(d40d->txd.flags &DMA_PREP_INTERRUPT ); callback = d40d->txd.callback; callback_param = d40d->txd.callback_param;
@@ -1456,7 +1458,7 @@ static void dma_tasklet(unsigned long data)spin_unlock_irqrestore (&d40c->lock, flags); -if (callback && (d40d->txd.flags &DMA_PREP_INTERRUPT )) +if (callback_active && callback)callback (callback_param);return ;
drivers/edac/i7core_edac.c +7 -2
@@ -1365,14 +1365,19 @@ static int i7core_get_onedevice(struct pci_dev **prev,* is at addr 8086:2c40, instead of 8086:2c41. So, we need * to probe for the alternate address in case of failure */ -if (dev_descr->dev_id ==PCI_DEVICE_ID_INTEL_I7_NONCORE && !pdev) +if (dev_descr->dev_id ==PCI_DEVICE_ID_INTEL_I7_NONCORE && !pdev) { +pci_dev_get (*prev);/* pci_get_device will put it */ pdev =pci_get_device (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_I7_NONCORE_ALT , *prev); + } -if (dev_descr->dev_id ==PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE && !pdev) +if (dev_descr->dev_id ==PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE && + !pdev) { +pci_dev_get (*prev);/* pci_get_device will put it */ pdev =pci_get_device (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_LYNNFIELD_NONCORE_ALT , *prev); + }if (!pdev) {if (*prev) {
drivers/hwmon/max1668.c +1 -1
@@ -243,7 +243,7 @@ static ssize_t set_temp_min(struct device *dev, data->temp_min[index] =SENSORS_LIMIT (temp/1000 ,-128 ,127 );if (i2c_smbus_write_byte_data (client,MAX1668_REG_LIML_WR (index), - data->temp_max[index])) + data->temp_min[index])) count = -EIO ;mutex_unlock (&data->update_lock);
drivers/md/dm-mpath.c +5 -2
@@ -1541,8 +1541,11 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,/* * Only pass ioctls through if the device sizes match exactly. */ -if (!r && ti->len !=i_size_read (bdev->bd_inode) >>SECTOR_SHIFT ) - r =scsi_verify_blk_ioctl (NULL , cmd); +if (!bdev || ti->len !=i_size_read (bdev->bd_inode) >>SECTOR_SHIFT ) { +int err =scsi_verify_blk_ioctl (NULL , cmd); +if (err) + r = err; + }return r ? :__blkdev_driver_ioctl (bdev, mode, cmd, arg); }
drivers/media/video/saa7134/saa7134-alsa.c +2 -0
@@ -172,7 +172,9 @@ static void saa7134_irq_alsa_done(struct saa7134_dev *dev,dprintk ("irq: overrun [full=%d/%d] - Blocks in %d\n" ,dev->dmasound.read_count, dev->dmasound.bufsize, dev->dmasound.blocks);spin_unlock (&dev->slock); +snd_pcm_stream_lock (dev->dmasound.substream);snd_pcm_stop (dev->dmasound.substream,SNDRV_PCM_STATE_XRUN ); +snd_pcm_stream_unlock (dev->dmasound.substream);return ; }
drivers/net/bonding/bond_3ad.c +2 -4
@@ -1854,8 +1854,6 @@ void bond_3ad_initiate_agg_selection(struct bonding *bond, int timeout)BOND_AD_INFO (bond).agg_select_timer = timeout; } -static u16 aggregator_identifier; -/** * bond_3ad_initialize - initialize a bond's 802.3ad parameters and structures * @bond: bonding struct to work on
@@ -1869,7 +1867,7 @@ void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution)if (MAC_ADDRESS_COMPARE (&(BOND_AD_INFO (bond).system.sys_mac_addr), bond->dev->dev_addr)) { - aggregator_identifier =0 ; +BOND_AD_INFO (bond).aggregator_identifier =0 ;BOND_AD_INFO (bond).system.sys_priority =0xFFFF ;BOND_AD_INFO (bond).system.sys_mac_addr = *((struct mac_addr *)bond->dev->dev_addr);
@@ -1941,7 +1939,7 @@ int bond_3ad_bind_slave(struct slave *slave)ad_initialize_agg (aggregator); aggregator->aggregator_mac_address = *((struct mac_addr *)bond->dev->dev_addr); - aggregator->aggregator_identifier = (++aggregator_identifier); + aggregator->aggregator_identifier = ++BOND_AD_INFO (bond).aggregator_identifier; aggregator->slave = slave; aggregator->is_active =0 ; aggregator->num_of_ports =0 ;
drivers/net/bonding/bond_3ad.h +1 -0
@@ -253,6 +253,7 @@ struct ad_system {struct ad_bond_info {struct ad_system system;/* 802.3ad system structure */ u32 agg_select_timer;// Timer to select aggregator after all adapter's hand shakes +u16 aggregator_identifier; };struct ad_slave_info {
drivers/net/ethernet/broadcom/tg3.c +2 -2
@@ -12343,12 +12343,12 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu)tg3_netif_stop (tp); +tg3_set_mtu (dev, tp, new_mtu); +tg3_full_lock (tp,1 );tg3_halt (tp,RESET_KIND_SHUTDOWN ,1 ); -tg3_set_mtu (dev, tp, new_mtu); -/* Reset PHY, otherwise the read DMA engine will be in a mode that * breaks all requests to 256 bytes. */
drivers/net/usb/asix.c +99 -29
191 lines not on this page · raw message
drivers/net/usb/gl620a.c +4 -0
@@ -86,6 +86,10 @@ static int genelink_rx_fixup(struct usbnet *dev, struct sk_buff *skb)u32 size;u32 count; +/* This check is no longer done by usbnet */ +if (skb->len < dev->net->hard_header_len) +return 0 ; + header = (struct gl_header *) skb->data;// get the packet count of the received skb
drivers/net/usb/mcs7830.c +3 -2
@@ -601,8 +601,9 @@ static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb) {u8 status; -if (skb->len ==0 ) { -dev_err (&dev->udev->dev,"unexpected empty rx frame\n" ); +/* This check is no longer done by usbnet */ +if (skb->len < dev->net->hard_header_len) { +dev_err (&dev->udev->dev,"unexpected tiny rx frame\n" );return 0 ; }
drivers/net/usb/net1080.c +4 -0
@@ -419,6 +419,10 @@ static int net1080_rx_fixup(struct usbnet *dev, struct sk_buff *skb)struct nc_trailer *trailer;u16 hdr_len, packet_len; +/* This check is no longer done by usbnet */ +if (skb->len < dev->net->hard_header_len) +return 0 ; +if (!(skb->len &0x01 )) {#ifdef DEBUG struct net_device *net = dev->net;
drivers/net/usb/qmi_wwan.c +4 -4
@@ -202,10 +202,10 @@ static int qmi_wwan_rx_fixup(struct usbnet *dev, struct sk_buff *skb) {__be16 proto; -/* usbnet rx_complete guarantees that skb->len is at least -* hard_header_len, so we can inspect the dest address without -* checking skb->len -*/ +/* This check is no longer done by usbnet */ +if (skb->len < dev->net->hard_header_len) +return 0 ; +switch (skb->data[0 ] &0xf0 ) {case 0x40 : proto =htons (ETH_P_IP );
drivers/net/usb/rndis_host.c +4 -0
@@ -490,6 +490,10 @@ EXPORT_SYMBOL_GPL(rndis_unbind);*/ int rndis_rx_fixup (struct usbnet *dev,struct sk_buff *skb) { +/* This check is no longer done by usbnet */ +if (skb->len < dev->net->hard_header_len) +return 0 ; +/* peripheral may have batched packets to us... */ while (likely (skb->len)) {struct rndis_data_hdr *hdr = (void *)skb->data;
drivers/net/usb/smsc75xx.c +4 -0
@@ -1093,6 +1093,10 @@ static void smsc75xx_rx_csum_offload(struct usbnet *dev, struct sk_buff *skb,static int smsc75xx_rx_fixup (struct usbnet *dev,struct sk_buff *skb) { +/* This check is no longer done by usbnet */ +if (skb->len < dev->net->hard_header_len) +return 0 ; +while (skb->len >0 ) {u32 rx_cmd_a, rx_cmd_b, align_count, size;struct sk_buff *ax_skb;
drivers/net/usb/smsc95xx.c +4 -0
@@ -1041,6 +1041,10 @@ static void smsc95xx_rx_csum_offload(struct sk_buff *skb)static int smsc95xx_rx_fixup (struct usbnet *dev,struct sk_buff *skb) { +/* This check is no longer done by usbnet */ +if (skb->len < dev->net->hard_header_len) +return 0 ; +while (skb->len >0 ) {u32 header, align_count;struct sk_buff *ax_skb;
drivers/net/usb/usbnet.c +10 -15
@@ -415,17 +415,19 @@ static inline void rx_process (struct usbnet *dev, struct sk_buff *skb) }// else network stack removes extra byte if we forced a short packet -if (skb->len) { -/* all data was already cloned from skb inside the driver */ -if (dev->driver_info->flags &FLAG_MULTI_PACKET ) -dev_kfree_skb_any (skb); -else -usbnet_skb_return (dev, skb); +/* all data was already cloned from skb inside the driver */ +if (dev->driver_info->flags &FLAG_MULTI_PACKET ) + goto done; + +if (skb->len <ETH_HLEN ) { + dev->net->stats.rx_errors++; + dev->net->stats.rx_length_errors++; +netif_dbg (dev, rx_err, dev->net,"rx length %d\n" , skb->len); + }else { +usbnet_skb_return (dev, skb);return ; } -netif_dbg (dev, rx_err, dev->net,"drop\n" ); - dev->net->stats.rx_errors++; done:skb_queue_tail (&dev->done, skb); }
@@ -447,13 +449,6 @@ static void rx_complete (struct urb *urb)switch (urb_status) {/* success */ case 0 : -if (skb->len < dev->net->hard_header_len) { - state = rx_cleanup; - dev->net->stats.rx_errors++; - dev->net->stats.rx_length_errors++; -netif_dbg (dev, rx_err, dev->net, -"rx length %d\n" , skb->len); - }break ;/* stalls need manual reset. this is rare ... except that
drivers/net/wireless/iwlwifi/iwl-6000.c +6 -0
@@ -459,6 +459,12 @@ const struct iwl_cfg iwl6035_2agn_cfg = { .ht_params = &iwl6000_ht_params, }; +const struct iwl_cfg iwl6035_2agn_sff_cfg = { + .name ="Intel(R) Centrino(R) Ultimate-N 6235 AGN" , +IWL_DEVICE_6035 , + .ht_params = &iwl6000_ht_params, +}; +const struct iwl_cfg iwl1030_bgn_cfg = { .name ="Intel(R) Centrino(R) Wireless-N 1030 BGN" ,IWL_DEVICE_6030 ,
drivers/net/wireless/iwlwifi/iwl-agn.c +1 -1
@@ -680,7 +680,7 @@ int iwl_alive_start(struct iwl_priv *priv) BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);if (ret)return ret; - }else { + }else if (priv->shrd->cfg->bt_params) {/* * default is 2-wire BT coexexistence support */
drivers/net/wireless/iwlwifi/iwl-cfg.h +1 -0
@@ -106,6 +106,7 @@ extern const struct iwl_cfg iwl2000_2bgn_cfg;extern const struct iwl_cfg iwl2000_2bgn_d_cfg;extern const struct iwl_cfg iwl2030_2bgn_cfg;extern const struct iwl_cfg iwl6035_2agn_cfg; +extern const struct iwl_cfg iwl6035_2agn_sff_cfg;extern const struct iwl_cfg iwl105_bgn_cfg;extern const struct iwl_cfg iwl105_bgn_d_cfg;extern const struct iwl_cfg iwl135_bgn_cfg;
drivers/net/wireless/iwlwifi/iwl-core.c +4 -1
@@ -801,7 +801,10 @@ void iwl_chswitch_done(struct iwl_priv *priv, bool is_success)if (test_bit (STATUS_EXIT_PENDING , &priv->status))return ; -if (test_and_clear_bit (STATUS_CHANNEL_SWITCH_PENDING , &priv->status)) +if (!test_and_clear_bit (STATUS_CHANNEL_SWITCH_PENDING , &priv->status)) +return ; + +if (ctx->vif)ieee80211_chswitch_done (ctx->vif, is_success); }
drivers/net/wireless/iwlwifi/iwl-debugfs.c +3 -0
@@ -227,6 +227,9 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file,const struct fw_img *img;size_t bufsz; +if (!iwl_is_ready_rf (priv)) +return -EAGAIN ; +/* default is to dump the entire data segment */ if (!priv->dbgfs_sram_offset && !priv->dbgfs_sram_len) { priv->dbgfs_sram_offset =0x800000 ;
drivers/net/wireless/iwlwifi/iwl-pci.c +10 -0
@@ -138,13 +138,16 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {/* 6x00 Series */ {IWL_PCI_DEVICE(0x422B, 0x1101, iwl6000_3agn_cfg)}, + {IWL_PCI_DEVICE(0x422B, 0x1108, iwl6000_3agn_cfg)}, {IWL_PCI_DEVICE(0x422B, 0x1121, iwl6000_3agn_cfg)}, + {IWL_PCI_DEVICE(0x422B, 0x1128, iwl6000_3agn_cfg)}, {IWL_PCI_DEVICE(0x422C, 0x1301, iwl6000i_2agn_cfg)}, {IWL_PCI_DEVICE(0x422C, 0x1306, iwl6000i_2abg_cfg)}, {IWL_PCI_DEVICE(0x422C, 0x1307, iwl6000i_2bg_cfg)}, {IWL_PCI_DEVICE(0x422C, 0x1321, iwl6000i_2agn_cfg)}, {IWL_PCI_DEVICE(0x422C, 0x1326, iwl6000i_2abg_cfg)}, {IWL_PCI_DEVICE(0x4238, 0x1111, iwl6000_3agn_cfg)}, + {IWL_PCI_DEVICE(0x4238, 0x1118, iwl6000_3agn_cfg)}, {IWL_PCI_DEVICE(0x4239, 0x1311, iwl6000i_2agn_cfg)}, {IWL_PCI_DEVICE(0x4239, 0x1316, iwl6000i_2abg_cfg)},
@@ -152,12 +155,16 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { {IWL_PCI_DEVICE(0x0082, 0x1301, iwl6005_2agn_cfg)}, {IWL_PCI_DEVICE(0x0082, 0x1306, iwl6005_2abg_cfg)}, {IWL_PCI_DEVICE(0x0082, 0x1307, iwl6005_2bg_cfg)}, + {IWL_PCI_DEVICE(0x0082, 0x1308, iwl6005_2agn_cfg)}, {IWL_PCI_DEVICE(0x0082, 0x1321, iwl6005_2agn_cfg)}, {IWL_PCI_DEVICE(0x0082, 0x1326, iwl6005_2abg_cfg)}, + {IWL_PCI_DEVICE(0x0082, 0x1328, iwl6005_2agn_cfg)}, {IWL_PCI_DEVICE(0x0085, 0x1311, iwl6005_2agn_cfg)}, + {IWL_PCI_DEVICE(0x0085, 0x1318, iwl6005_2agn_cfg)}, {IWL_PCI_DEVICE(0x0085, 0x1316, iwl6005_2abg_cfg)}, {IWL_PCI_DEVICE(0x0082, 0xC020, iwl6005_2agn_sff_cfg)}, {IWL_PCI_DEVICE(0x0085, 0xC220, iwl6005_2agn_sff_cfg)}, + {IWL_PCI_DEVICE(0x0085, 0xC228, iwl6005_2agn_sff_cfg)}, {IWL_PCI_DEVICE(0x0082, 0x4820, iwl6005_2agn_d_cfg)}, {IWL_PCI_DEVICE(0x0082, 0x1304, iwl6005_2agn_mow1_cfg)},/* low 5GHz active */ {IWL_PCI_DEVICE(0x0082, 0x1305, iwl6005_2agn_mow2_cfg)},/* high 5GHz active */
@@ -239,8 +246,11 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {/* 6x35 Series */ {IWL_PCI_DEVICE(0x088E, 0x4060, iwl6035_2agn_cfg)}, + {IWL_PCI_DEVICE(0x088E, 0x406A, iwl6035_2agn_sff_cfg)}, {IWL_PCI_DEVICE(0x088F, 0x4260, iwl6035_2agn_cfg)}, + {IWL_PCI_DEVICE(0x088F, 0x426A, iwl6035_2agn_sff_cfg)}, {IWL_PCI_DEVICE(0x088E, 0x4460, iwl6035_2agn_cfg)}, + {IWL_PCI_DEVICE(0x088E, 0x446A, iwl6035_2agn_sff_cfg)}, {IWL_PCI_DEVICE(0x088E, 0x4860, iwl6035_2agn_cfg)},/* 105 Series */
drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h +10 -1
@@ -209,6 +209,15 @@ struct iwl_queue {#define TFD_TX_CMD_SLOTS 256#define TFD_CMD_SLOTS 32 +/* +* The FH will write back to the first TB only, so we need +* to copy some data into the buffer regardless of whether +* it should be mapped or not. This indicates how much to +* copy, even for HCMDs it must be big enough to fit the +* DRAM scratch from the TX cmd, at least 16 bytes. +*/ +#define IWL_HCMD_MIN_COPY_SIZE 16 +struct iwl_tx_queue {struct iwl_queue q;struct iwl_tfd *tfds;
@@ -352,7 +361,7 @@ int iwl_queue_space(const struct iwl_queue *q);******************************************************/ int iwl_dump_nic_event_log (struct iwl_trans *trans,bool full_log,char **buf,bool display); -int iwl_dump_fh (struct iwl_trans *trans,char **buf,bool display); +int iwl_dump_fh (struct iwl_trans *trans,char **buf);void iwl_dump_csr (struct iwl_trans *trans);/*****************************************************
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c +32 -5
@@ -315,6 +315,14 @@ static void iwlagn_rx_allocate(struct iwl_trans *trans, gfp_t priority) rxb->page_dma =dma_map_page (trans->dev, page,0 ,PAGE_SIZE <<hw_params (trans).rx_page_order,DMA_FROM_DEVICE ); +if (dma_mapping_error (trans->dev, rxb->page_dma)) { + rxb->page =NULL ; +spin_lock_irqsave (&rxq->lock, flags); +list_add (&rxb->list, &rxq->rx_used); +spin_unlock_irqrestore (&rxq->lock, flags); +__free_pages (page,hw_params (trans).rx_page_order); +return ; + }/* dma address must be no more than 36 bits */ BUG_ON (rxb->page_dma & ~DMA_BIT_MASK (36 ));/* and also 256 byte aligned! */
@@ -450,8 +458,19 @@ static void iwl_rx_handle_rxbuf(struct iwl_trans *trans,dma_map_page (trans->dev, rxb->page,0 ,PAGE_SIZE <<hw_params (trans).rx_page_order,DMA_FROM_DEVICE ); -list_add_tail (&rxb->list, &rxq->rx_free); - rxq->free_count++; +if (dma_mapping_error (trans->dev, rxb->page_dma)) { +/* +* free the page(s) as well to not break +* the invariant that the items on the used +* list have no page(s) +*/ +__free_pages (rxb->page,hw_params (trans).rx_page_order); + rxb->page =NULL ; +list_add_tail (&rxb->list, &rxq->rx_used); + }else { +list_add_tail (&rxb->list, &rxq->rx_free); + rxq->free_count++; + } }else list_add_tail (&rxb->list, &rxq->rx_used);spin_unlock_irqrestore (&rxq->lock, flags);
@@ -695,7 +714,7 @@ static void iwl_irq_handle_error(struct iwl_trans *trans)iwl_dump_nic_error_log (trans);iwl_dump_csr (trans); -iwl_dump_fh (trans,NULL , false); +iwl_dump_fh (trans,NULL );iwl_dump_nic_event_log (trans, false,NULL , false);iwl_op_mode_nic_error (trans->op_mode);
@@ -1264,12 +1283,20 @@ static irqreturn_t iwl_isr(int irq, void *data)* back-to-back ISRs and sporadic interrupts from our NIC. * If we have something to service, the tasklet will re-enable ints. * If we *don't* have something, we'll re-enable before leaving here. */ - inta_mask =iwl_read32 (trans,CSR_INT_MASK );/* just for debug */ + inta_mask =iwl_read32 (trans,CSR_INT_MASK );iwl_write32 (trans,CSR_INT_MASK ,0x00000000 );/* Discover which interrupts are active/pending */ inta =iwl_read32 (trans,CSR_INT ); +if (inta & (~inta_mask)) { +IWL_DEBUG_ISR (trans, +"We got a masked interrupt (0x%08x)...Ack and ignore\n" , + inta & (~inta_mask)); +iwl_write32 (trans,CSR_INT , inta & (~inta_mask)); + inta &= inta_mask; + } +/* Ignore interrupt if there's nothing in NIC to service. * This may be due to IRQ shared with another device, * or due to sporadic interrupts thrown from our NIC. */
@@ -1353,7 +1380,7 @@ irqreturn_t iwl_isr_ict(int irq, void *data)* If we have something to service, the tasklet will re-enable ints. * If we *don't* have something, we'll re-enable before leaving here. */ - inta_mask =iwl_read32 (trans,CSR_INT_MASK );/* just for debug */ + inta_mask =iwl_read32 (trans,CSR_INT_MASK );iwl_write32 (trans,CSR_INT_MASK ,0x00000000 );
drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c +53 -12
115 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +14 -13
@@ -1768,13 +1768,9 @@ static const char *get_fh_string(int cmd) } } -int iwl_dump_fh (struct iwl_trans *trans,char **buf,bool display) +int iwl_dump_fh (struct iwl_trans *trans,char **buf) {int i; -#ifdef CONFIG_IWLWIFI_DEBUG -int pos =0 ; -size_t bufsz =0 ; -#endif static const u32 fh_tbl[] = {FH_RSCSR_CHNL0_STTS_WPTR_REG ,FH_RSCSR_CHNL0_RBDCB_BASE_REG ,
@@ -1786,29 +1782,34 @@ int iwl_dump_fh(struct iwl_trans *trans, char **buf, bool display)FH_TSSR_TX_STATUS_REG ,FH_TSSR_TX_ERROR_REG }; -#ifdef CONFIG_IWLWIFI_DEBUG -if (display) { + +#ifdef CONFIG_IWLWIFI_DEBUGFS +if (buf) { +int pos =0 ; +size_t bufsz =ARRAY_SIZE (fh_tbl) *48 +40 ; + bufsz =ARRAY_SIZE (fh_tbl) *48 +40 ; *buf =kmalloc (bufsz,GFP_KERNEL );if (!*buf)return -ENOMEM ; pos +=scnprintf (*buf + pos, bufsz - pos,"FH register values:\n" ); -for (i =0 ; i <ARRAY_SIZE (fh_tbl); i++) { + +for (i =0 ; i <ARRAY_SIZE (fh_tbl); i++) pos +=scnprintf (*buf + pos, bufsz - pos," %34s: 0X%08x\n" ,get_fh_string (fh_tbl[i]),iwl_read_direct32 (trans, fh_tbl[i])); - } +return pos; }#endif IWL_ERR (trans,"FH register values:\n" ); -for (i =0 ; i <ARRAY_SIZE (fh_tbl); i++) { +for (i =0 ; i <ARRAY_SIZE (fh_tbl); i++)IWL_ERR (trans," %34s: 0X%08x\n" ,get_fh_string (fh_tbl[i]),iwl_read_direct32 (trans, fh_tbl[i])); - } +return 0 ; }
@@ -2152,11 +2153,11 @@ static ssize_t iwl_dbgfs_fh_reg_read(struct file *file, size_t count, loff_t *ppos) { struct iwl_trans *trans = file->private_data; -char *buf; +char *buf =NULL ;int pos =0 ;ssize_t ret = -EFAULT ; - ret = pos =iwl_dump_fh (trans, &buf, true); + ret = pos =iwl_dump_fh (trans, &buf);if (buf) { ret =simple_read_from_buffer (user_buf, count, ppos, buf, pos);
drivers/net/wireless/rtl818x/rtl8187/rtl8187.h +8 -2
@@ -15,6 +15,8 @@#ifndef RTL8187_H #define RTL8187_H +#include <linux/cache.h> +#include "rtl818x.h" #include "leds.h"
@@ -139,7 +141,10 @@ struct rtl8187_priv {u8 aifsn[4 ];u8 rfkill_mask;struct { -__le64 buf; +union { +__le64 buf; +u8 dummy1[L1_CACHE_BYTES ]; + }____cacheline_aligned ;struct sk_buff_head queue; } b_tx_status;/* This queue is used by both -b and non-b devices */ struct mutex io_mutex;
@@ -147,7 +152,8 @@ struct rtl8187_priv {u8 bits8;__le16 bits16;__le32 bits32; - } *io_dmabuf; +u8 dummy2[L1_CACHE_BYTES ]; + } *io_dmabuf____cacheline_aligned ;bool rfkill_off;u16 seqno; };
drivers/net/wireless/rtlwifi/base.c +40 -49
107 lines not on this page · raw message
drivers/net/wireless/rtlwifi/ps.c +1 -1
@@ -48,7 +48,7 @@ bool rtl_ps_enable_nic(struct ieee80211_hw *hw)/*<2> Enable Adapter */ if (rtlpriv->cfg->ops->hw_init (hw)) -return 1 ; +return false;RT_CLEAR_PS_LEVEL (ppsc,RT_RF_OFF_LEVL_HALT_NIC );/*<3> Enable Interrupt */
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +16 -2
@@ -902,14 +902,26 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw)bool is92c;int err;u8 tmp_u1b; +unsigned long flags; rtlpci->being_init_adapter = true; + +/* Since this function can take a very long time (up to 350 ms) +* and can be called with irqs disabled, reenable the irqs +* to let the other devices continue being serviced. +* +* It is safe doing so since our own interrupts will only be enabled +* in a subsequent step. +*/ +local_save_flags (flags); +local_irq_enable (); + rtlpriv->intf_ops->disable_aspm (hw); rtstatus =_rtl92ce_init_mac (hw);if (!rtstatus) {RT_TRACE (rtlpriv,COMP_ERR ,DBG_EMERG ,"Init MAC failed\n" ); err =1 ; -return err; + goto exit; } err =rtl92c_download_fw (hw);
@@ -917,7 +929,7 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw)RT_TRACE (rtlpriv,COMP_ERR ,DBG_WARNING ,"Failed to download FW. Init HW without FW now..\n" ); err =1 ; -return err; + goto exit; } rtlhal->last_hmeboxnum =0 ;
@@ -978,6 +990,8 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw)RT_TRACE (rtlpriv,COMP_INIT ,DBG_TRACE ,"under 1.5V\n" ); }rtl92c_dm_init (hw); +exit: +local_irq_restore (flags); rtlpci->being_init_adapter = false;return err; }
drivers/net/wireless/rtlwifi/wifi.h +1 -5
@@ -77,11 +77,7 @@#define RTL_SLOT_TIME_9 9#define RTL_SLOT_TIME_20 20 -/*related with tcp/ip. */ -/*if_ehther.h*/ -#define ETH_P_PAE 0x888E/*Port Access Entity (IEEE 802.1X) */ -#define ETH_P_IP 0x0800/*Internet Protocol packet */ -#define ETH_P_ARP 0x0806/*Address Resolution packet */ +/*related to tcp/ip. */ #define SNAP_SIZE 6#define PROTOC_TYPE_SIZE 2
drivers/net/xen-netback/netback.c +236 -53
457 lines not on this page · raw message
drivers/staging/line6/pcm.c +4 -1
@@ -378,8 +378,11 @@ static int snd_line6_pcm_free(struct snd_device *device)*/ static void pcm_disconnect_substream (struct snd_pcm_substream *substream) { -if (substream->runtime &&snd_pcm_running (substream)) +if (substream->runtime &&snd_pcm_running (substream)) { +snd_pcm_stream_lock_irq (substream);snd_pcm_stop (substream,SNDRV_PCM_STATE_DISCONNECTED ); +snd_pcm_stream_unlock_irq (substream); + } }/*
drivers/usb/serial/ftdi_sio.c +2 -0
@@ -920,6 +920,8 @@ static struct usb_device_id id_table_combined [] = {/* Crucible Devices */ { USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) }, { USB_DEVICE(FTDI_VID, FTDI_Z3X_PID) }, +/* Cressi Devices */ + { USB_DEVICE(FTDI_VID, FTDI_CRESSI_PID) }, { }, /* Optional parameter entry */ { } /* Terminating entry */ };
drivers/usb/serial/ftdi_sio_ids.h +6 -0
@@ -1320,3 +1320,9 @@* Manufacturer: Smart GSM Team */ #define FTDI_Z3X_PID 0x0011 + +/* +* Product: Cressi PC Interface +* Manufacturer: Cressi +*/ +#define FTDI_CRESSI_PID 0x87d0
drivers/usb/serial/option.c +2 -1
@@ -1546,7 +1546,8 @@ static const struct usb_device_id option_ids[] = {/* Cinterion */ { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_E) }, { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_P) }, - { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8) }, + { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8), + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX) }, { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PLXX), .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
drivers/xen/events.c +11 -0
@@ -1422,8 +1422,10 @@ void rebind_evtchn_irq(int evtchn, int irq)/* Rebind an evtchn so that it gets delivered to a specific cpu */ static int rebind_irq_to_cpu (unsigned irq,unsigned tcpu) { +struct shared_info *s = HYPERVISOR_shared_info;struct evtchn_bind_vcpu bind_vcpu;int evtchn =evtchn_from_irq (irq); +int masked;if (!VALID_EVTCHN (evtchn))return -1 ;
@@ -1440,6 +1442,12 @@ static int rebind_irq_to_cpu(unsigned irq, unsigned tcpu) bind_vcpu.vcpu = tcpu;/* +* Mask the event while changing the VCPU binding to prevent +* it being delivered on an unexpected VCPU. +*/ + masked =sync_test_and_set_bit (evtchn, s->evtchn_mask); + +/* * If this fails, it usually just indicates that we're dealing with a * virq or IPI channel, which don't actually need to be rebound. Ignore * it, but don't do the xenlinux-level rebind in that case.
@@ -1447,6 +1455,9 @@ static int rebind_irq_to_cpu(unsigned irq, unsigned tcpu)if (HYPERVISOR_event_channel_op (EVTCHNOP_bind_vcpu, &bind_vcpu) >=0 )bind_evtchn_to_cpu (evtchn, tcpu); +if (!masked) +unmask_evtchn (evtchn); +return 0 ; }
fs/cifs/file.c +34 -3
@@ -2185,7 +2185,7 @@ cifs_iovec_write(struct file *file, const struct iovec *iov, unsigned long nr_segs, loff_t *poffset) { unsigned long nr_pages, i; -size_t copied, len, cur_len; +size_t bytes, copied, len, cur_len;ssize_t total_written =0 ;loff_t offset;struct iov_iter it;
@@ -2236,14 +2236,45 @@ cifs_iovec_write(struct file *file, const struct iovec *iov, save_len = cur_len;for (i =0 ; i < nr_pages; i++) { - copied = min_t(const size_t, cur_len, PAGE_SIZE); + bytes = min_t(const size_t, cur_len, PAGE_SIZE); copied =iov_iter_copy_from_user (wdata->pages[i], &it, -0 , copied); +0 , bytes); cur_len -= copied;iov_iter_advance (&it, copied); +/* +* If we didn't copy as much as we expected, then that +* may mean we trod into an unmapped area. Stop copying +* at that point. On the next pass through the big +* loop, we'll likely end up getting a zero-length +* write and bailing out of it. +*/ +if (copied < bytes) +break ; } cur_len = save_len - cur_len; +/* +* If we have no data to send, then that probably means that +* the copy above failed altogether. That's most likely because +* the address in the iovec was bogus. Set the rc to -EFAULT, +* free anything we allocated and bail out. +*/ +if (!cur_len) { +for (i =0 ; i < nr_pages; i++) +put_page (wdata->pages[i]); +kfree (wdata); + rc = -EFAULT ; +break ; + } + +/* +* i + 1 now represents the number of pages we actually used in +* the copy phase above. Bring nr_pages down to that, and free +* any pages that we didn't use. +*/ +for ( ; nr_pages > i +1 ; nr_pages--) +put_page (wdata->pages[nr_pages -1 ]); + wdata->sync_mode =WB_SYNC_ALL ; wdata->nr_pages = nr_pages; wdata->offset = (__u64 )offset;
fs/cifs/readdir.c +8 -0
@@ -96,6 +96,14 @@ cifs_readdir_lookup(struct dentry *parent, struct qstr *name,dput (dentry); } +/* +* If we know that the inode will need to be revalidated immediately, +* then don't create a new dentry for it. We'll end up doing an on +* the wire call either way and this spares us an invalidation. +*/ +if (fattr->cf_flags &CIFS_FATTR_NEED_REVAL ) +return NULL ; + dentry =d_alloc (parent, name);if (dentry ==NULL )return NULL ;
fs/cifs/transport.c +7 -0
@@ -511,6 +511,13 @@ send_nt_cancel(struct TCP_Server_Info *server, struct smb_hdr *in_buf,mutex_unlock (&server->srv_mutex);return rc; } + +/* +* The response to this call was already factored into the sequence +* number when the call went out, so we must adjust it back downward +* after signing here. +*/ + --server->sequence_number; rc =smb_send (server, in_buf,be32_to_cpu (in_buf->smb_buf_length));mutex_unlock (&server->srv_mutex);
fs/ext4/ext4.h +2 -0
@@ -751,6 +751,8 @@ do { \if (EXT4_FITS_IN_INODE (raw_inode, einode, xtime)) \ (einode)->xtime.tv_sec = \ (signed )le32_to_cpu ((raw_inode)->xtime); \ +else \ + (einode)->xtime.tv_sec =0 ; \ if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime ## _extra)) \ext4_decode_extra_time (&(einode)->xtime, \ raw_inode->xtime ## _extra); \
fs/ext4/extents.c +14 -11
@@ -670,6 +670,7 @@ ext4_ext_find_extent(struct inode *inode, ext4_lblk_t block,struct ext4_extent_header *eh;struct buffer_head *bh;short int depth, i, ppos =0 , alloc =0 ; +int ret; eh =ext_inode_hdr (inode); depth =ext_depth (inode);
@@ -699,12 +700,15 @@ ext4_ext_find_extent(struct inode *inode, ext4_lblk_t block, path[ppos].p_ext =NULL ; bh =sb_getblk (inode->i_sb, path[ppos].p_block); -if (unlikely (!bh)) +if (unlikely (!bh)) { + ret = -ENOMEM ; goto err; + }if (!bh_uptodate_or_lock (bh)) {trace_ext4_ext_load_extent (inode, block, path[ppos].p_block); -if (bh_submit_read (bh) <0 ) { + ret =bh_submit_read (bh); +if (ret <0 ) {put_bh (bh); goto err; }
@@ -717,13 +721,15 @@ ext4_ext_find_extent(struct inode *inode, ext4_lblk_t block,put_bh (bh);EXT4_ERROR_INODE (inode,"ppos %d > depth %d" , ppos, depth); + ret = -EIO ; goto err; } path[ppos].p_bh = bh; path[ppos].p_hdr = eh; i--; -if (need_to_validate &&ext4_ext_check (inode, eh, i)) + ret = need_to_validate ?ext4_ext_check (inode, eh, i) :0 ; +if (ret <0 ) goto err; }
@@ -745,7 +751,7 @@ err:ext4_ext_drop_refs (path);if (alloc)kfree (path); -return ERR_PTR (-EIO ); +return ERR_PTR (ret); }/*
@@ -900,7 +906,7 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode, } bh =sb_getblk (inode->i_sb, newblock);if (!bh) { - err = -EIO ; + err = -ENOMEM ; goto cleanup; }lock_buffer (bh);
@@ -972,7 +978,7 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode, newblock = ablocks[--a]; bh =sb_getblk (inode->i_sb, newblock);if (!bh) { - err = -EIO ; + err = -ENOMEM ; goto cleanup; }lock_buffer (bh);
@@ -1083,11 +1089,8 @@ static int ext4_ext_grow_indepth(handle_t *handle, struct inode *inode,return err; bh =sb_getblk (inode->i_sb, newblock); -if (!bh) { - err = -EIO ; -ext4_std_error (inode->i_sb, err); -return err; - } +if (!bh) +return -ENOMEM ;lock_buffer (bh); err =ext4_journal_get_create_access (handle, bh);
fs/ext4/fsync.c +1 -2
@@ -260,8 +260,7 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync)if (journal->j_flags &JBD2_BARRIER && !jbd2_trans_will_send_data_barrier (journal, commit_tid)) needs_barrier = true; -jbd2_log_start_commit (journal, commit_tid); - ret =jbd2_log_wait_commit (journal, commit_tid); + ret =jbd2_complete_transaction (journal, commit_tid);if (needs_barrier)blkdev_issue_flush (inode->i_sb->s_bdev,GFP_KERNEL ,NULL ); out:
fs/ext4/indirect.c +6 -3
@@ -145,6 +145,7 @@ static Indirect *ext4_get_branch(struct inode *inode, int depth,struct super_block *sb = inode->i_sb;Indirect *p = chain;struct buffer_head *bh; +int ret = -EIO ; *err =0 ;/* i_data is not going away, no lock needed */
@@ -153,8 +154,10 @@ static Indirect *ext4_get_branch(struct inode *inode, int depth, goto no_block;while (--depth) { bh =sb_getblk (sb,le32_to_cpu (p->key)); -if (unlikely (!bh)) +if (unlikely (!bh)) { + ret = -ENOMEM ; goto failure; + }if (!bh_uptodate_or_lock (bh)) {if (bh_submit_read (bh) <0 ) {
@@ -176,7 +179,7 @@ static Indirect *ext4_get_branch(struct inode *inode, int depth,return NULL ; failure: - *err = -EIO ; + *err = ret; no_block:return p; }
@@ -470,7 +473,7 @@ static int ext4_alloc_branch(handle_t *handle, struct inode *inode,*/ bh =sb_getblk (inode->i_sb, new_blocks[n-1 ]);if (unlikely (!bh)) { - err = -EIO ; + err = -ENOMEM ; goto failed; }
fs/ext4/inode.c +5 -9
@@ -149,8 +149,7 @@ void ext4_evict_inode(struct inode *inode)journal_t *journal =EXT4_SB (inode->i_sb)->s_journal;tid_t commit_tid =EXT4_I (inode)->i_datasync_tid; -jbd2_log_start_commit (journal, commit_tid); -jbd2_log_wait_commit (journal, commit_tid); +jbd2_complete_transaction (journal, commit_tid);filemap_write_and_wait (&inode->i_data); }truncate_inode_pages (&inode->i_data,0 );
@@ -664,7 +663,7 @@ struct buffer_head *ext4_getblk(handle_t *handle, struct inode *inode, bh =sb_getblk (inode->i_sb, map.m_pblk);if (!bh) { - *errp = -EIO ; + *errp = -ENOMEM ;return NULL ; }if (map.m_flags &EXT4_MAP_NEW ) {
@@ -2801,9 +2800,9 @@ static void ext4_end_io_dio(struct kiocb *iocb, loff_t offset,if (!(io_end->flag &EXT4_IO_END_UNWRITTEN )) {ext4_free_io_end (io_end); out: +inode_dio_done (inode);if (is_async)aio_complete (iocb, ret,0 ); -inode_dio_done (inode);return ; }
@@ -3462,11 +3461,8 @@ static int __ext4_get_inode_loc(struct inode *inode, iloc->offset = (inode_offset % inodes_per_block) *EXT4_INODE_SIZE (sb); bh =sb_getblk (sb, block); -if (!bh) { -EXT4_ERROR_INODE_BLOCK (inode, block, -"unable to read itable block" ); -return -EIO ; - } +if (!bh) +return -ENOMEM ;if (!buffer_uptodate (bh)) {lock_buffer (bh);
fs/ext4/mmp.c +2 -0
@@ -41,6 +41,8 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,* is not blocked in the elevator. */ if (!*bh) *bh =sb_getblk (sb, mmp_block); +if (!*bh) +return -ENOMEM ;if (*bh) {get_bh (*bh);lock_buffer (*bh);
fs/ext4/page-io.c +4 -5
@@ -107,14 +107,13 @@ int ext4_end_io_nolock(ext4_io_end_t *io) inode->i_ino, offset, size, ret); } -if (io->iocb) -aio_complete (io->iocb, io->result,0 ); - -if (io->flag &EXT4_IO_END_DIRECT ) -inode_dio_done (inode);/* Wake up anyone waiting on unwritten extent conversion */ if (atomic_dec_and_test (&EXT4_I (inode)->i_aiodio_unwritten))wake_up_all (ext4_ioend_wq (io->inode)); +if (io->flag &EXT4_IO_END_DIRECT ) +inode_dio_done (inode); +if (io->iocb) +aio_complete (io->iocb, io->result,0 );return ret; }
fs/ext4/resize.c +5 -5
@@ -315,7 +315,7 @@ static struct buffer_head *bclean(handle_t *handle, struct super_block *sb, bh =sb_getblk (sb, blk);if (!bh) -return ERR_PTR (-EIO ); +return ERR_PTR (-ENOMEM );if ((err =ext4_journal_get_write_access (handle, bh))) {brelse (bh); bh =ERR_PTR (err);
@@ -377,7 +377,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle, start =ext4_group_first_block_no (sb, group); group -= flex_gd->groups[0 ].group; - count2 = sb->s_blocksize *8 - (block - start); + count2 =EXT4_BLOCKS_PER_GROUP (sb) - (block - start);if (count2 > count) count2 = count;
@@ -392,7 +392,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle, bh =sb_getblk (sb, flex_gd->groups[group].block_bitmap);if (!bh) -return -EIO ; +return -ENOMEM ; err =ext4_journal_get_write_access (handle, bh);if (err)
@@ -470,7 +470,7 @@ static int setup_new_flex_group_blocks(struct super_block *sb, gdb =sb_getblk (sb, block);if (!gdb) { - err = -EIO ; + err = -ENOMEM ; goto out; }
@@ -991,7 +991,7 @@ static void update_backups(struct super_block *sb, bh =sb_getblk (sb, group * bpg + blk_off);if (!bh) { - err = -EIO ; + err = -ENOMEM ;break ; } ext4_debug("update metadata backup %#04lx\n",
fs/ext4/super.c +13 -7
@@ -3370,16 +3370,22 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)for (i =0 ; i <4 ; i++) sbi->s_hash_seed[i] =le32_to_cpu (es->s_hash_seed[i]); sbi->s_def_hash_version = es->s_def_hash_version; - i =le32_to_cpu (es->s_flags); -if (i &EXT2_FLAGS_UNSIGNED_HASH ) - sbi->s_hash_unsigned =3 ; -else if ((i &EXT2_FLAGS_SIGNED_HASH ) ==0 ) { +if (EXT4_HAS_COMPAT_FEATURE (sb,EXT4_FEATURE_COMPAT_DIR_INDEX )) { + i =le32_to_cpu (es->s_flags); +if (i &EXT2_FLAGS_UNSIGNED_HASH ) + sbi->s_hash_unsigned =3 ; +else if ((i &EXT2_FLAGS_SIGNED_HASH ) ==0 ) {#ifdef __CHAR_UNSIGNED__ - es->s_flags |=cpu_to_le32 (EXT2_FLAGS_UNSIGNED_HASH ); - sbi->s_hash_unsigned =3 ; +if (!(sb->s_flags &MS_RDONLY )) + es->s_flags |= +cpu_to_le32 (EXT2_FLAGS_UNSIGNED_HASH ); + sbi->s_hash_unsigned =3 ;#else - es->s_flags |=cpu_to_le32 (EXT2_FLAGS_SIGNED_HASH ); +if (!(sb->s_flags &MS_RDONLY )) + es->s_flags |= +cpu_to_le32 (EXT2_FLAGS_SIGNED_HASH );#endif + } }/* Handle clustersize */
fs/ext4/xattr.c +2 -1
@@ -840,16 +840,17 @@ inserted: new_bh =sb_getblk (sb, block);if (!new_bh) { + error = -ENOMEM ; getblk_failed:ext4_free_blocks (handle, inode,NULL , block,1 ,EXT4_FREE_BLOCKS_METADATA ); - error = -EIO ; goto cleanup; }lock_buffer (new_bh); error =ext4_journal_get_create_access (handle, new_bh);if (error) {unlock_buffer (new_bh); + error = -EIO ; goto getblk_failed; }memcpy (new_bh->b_data, s->base, new_bh->b_size);
fs/fuse/dir.c +8 -1
@@ -1103,6 +1103,8 @@ static int parse_dirfile(char *buf, size_t nbytes, struct file *file,return -EIO ;if (reclen > nbytes)break ; +if (memchr (dirent->name,'/' , dirent->namelen) !=NULL ) +return -EIO ; over =filldir (dstbuf, dirent->name, dirent->namelen, file->f_pos, dirent->ino, dirent->type);
@@ -1346,6 +1348,7 @@ static int fuse_do_setattr(struct dentry *entry, struct iattr *attr, {struct inode *inode = entry->d_inode;struct fuse_conn *fc =get_fuse_conn (inode); +struct fuse_inode *fi =get_fuse_inode (inode);struct fuse_req *req;struct fuse_setattr_in inarg;struct fuse_attr_out outarg;
@@ -1376,8 +1379,10 @@ static int fuse_do_setattr(struct dentry *entry, struct iattr *attr,if (IS_ERR (req))return PTR_ERR (req); -if (is_truncate) +if (is_truncate) {fuse_set_nowrite (inode); +set_bit (FUSE_I_SIZE_UNSTABLE , &fi->state); + }memset (&inarg,0 ,sizeof (inarg));memset (&outarg,0 ,sizeof (outarg));
@@ -1439,12 +1444,14 @@ static int fuse_do_setattr(struct dentry *entry, struct iattr *attr,invalidate_inode_pages2 (inode->i_mapping); } +clear_bit (FUSE_I_SIZE_UNSTABLE , &fi->state);return 0 ; error:if (is_truncate)fuse_release_nowrite (inode); +clear_bit (FUSE_I_SIZE_UNSTABLE , &fi->state);return err; }
fs/fuse/file.c +7 -1
@@ -515,7 +515,8 @@ static void fuse_read_update_size(struct inode *inode, loff_t size,struct fuse_inode *fi =get_fuse_inode (inode);spin_lock (&fc->lock); -if (attr_ver == fi->attr_version && size < inode->i_size) { +if (attr_ver == fi->attr_version && size < inode->i_size && + !test_bit (FUSE_I_SIZE_UNSTABLE , &fi->state)) { fi->attr_version = ++fc->attr_version;i_size_write (inode, size); }
@@ -877,12 +878,16 @@ static ssize_t fuse_perform_write(struct file *file, {struct inode *inode = mapping->host;struct fuse_conn *fc =get_fuse_conn (inode); +struct fuse_inode *fi =get_fuse_inode (inode);int err =0 ;ssize_t res =0 ;if (is_bad_inode (inode))return -EIO ; +if (inode->i_size < pos +iov_iter_count (ii)) +set_bit (FUSE_I_SIZE_UNSTABLE , &fi->state); + do { struct fuse_req *req; ssize_t count;
@@ -917,6 +922,7 @@ static ssize_t fuse_perform_write(struct file *file,if (res >0 )fuse_write_update_size (inode, pos); +clear_bit (FUSE_I_SIZE_UNSTABLE , &fi->state);fuse_invalidate_attr (inode);return res >0 ? res : err;
fs/fuse/fuse_i.h +9 -0
@@ -103,6 +103,15 @@ struct fuse_inode {/** List of writepage requestst (pending or sent) */ struct list_head writepages; + +/** Miscellaneous bits describing inode state */ +unsigned long state; +}; + +/** FUSE inode state bits */ +enum { +/** An operation changing file size is in progress */ +FUSE_I_SIZE_UNSTABLE , };struct fuse_conn ;
fs/fuse/inode.c +3 -1
@@ -92,6 +92,7 @@ static struct inode *fuse_alloc_inode(struct super_block *sb) fi->attr_version =0 ; fi->writectr =0 ; fi->orig_ino =0 ; + fi->state =0 ;INIT_LIST_HEAD (&fi->write_files);INIT_LIST_HEAD (&fi->queued_writes);INIT_LIST_HEAD (&fi->writepages);
@@ -199,7 +200,8 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr,loff_t oldsize;spin_lock (&fc->lock); -if (attr_version !=0 && fi->attr_version > attr_version) { +if ((attr_version !=0 && fi->attr_version > attr_version) || +test_bit (FUSE_I_SIZE_UNSTABLE , &fi->state)) {spin_unlock (&fc->lock);return ; }
fs/jbd2/journal.c +31 -0
@@ -662,6 +662,37 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid) }/* +* When this function returns the transaction corresponding to tid +* will be completed. If the transaction has currently running, start +* committing that transaction before waiting for it to complete. If +* the transaction id is stale, it is by definition already completed, +* so just return SUCCESS. +*/ +int jbd2_complete_transaction (journal_t *journal,tid_t tid) +{ +int need_to_wait =1 ; + +read_lock (&journal->j_state_lock); +if (journal->j_running_transaction && + journal->j_running_transaction->t_tid == tid) { +if (journal->j_commit_request != tid) { +/* transaction not yet started, so request it */ +read_unlock (&journal->j_state_lock); +jbd2_log_start_commit (journal, tid); + goto wait_commit; + } + }else if (!(journal->j_committing_transaction && + journal->j_committing_transaction->t_tid == tid)) + need_to_wait =0 ; +read_unlock (&journal->j_state_lock); +if (!need_to_wait) +return 0 ; +wait_commit: +return jbd2_log_wait_commit (journal, tid); +} +EXPORT_SYMBOL (jbd2_complete_transaction); + +/* * Log buffer allocation routines: */
fs/ncpfs/dir.c +0 -9
@@ -1033,15 +1033,6 @@ static int ncp_rmdir(struct inode *dir, struct dentry *dentry)DPRINTK ("ncp_rmdir: removing %s/%s\n" , dentry->d_parent->d_name.name, dentry->d_name.name); -/* -* fail with EBUSY if there are still references to this -* directory. -*/ -dentry_unhash (dentry); - error = -EBUSY ; -if (!d_unhashed (dentry)) - goto out; - len =sizeof (__name); error =ncp_io2vol (server, __name, &len, dentry->d_name.name, dentry->d_name.len, !ncp_preserve_case (dir));
fs/nilfs2/page.c +2 -0
@@ -94,6 +94,7 @@ void nilfs_forget_buffer(struct buffer_head *bh)clear_buffer_nilfs_volatile (bh);clear_buffer_nilfs_checked (bh);clear_buffer_nilfs_redirected (bh); +clear_buffer_async_write (bh);clear_buffer_dirty (bh);if (nilfs_page_buffers_clean (page))__nilfs_clear_page_dirty (page);
@@ -390,6 +391,7 @@ void nilfs_clear_dirty_pages(struct address_space *mapping) bh = head =page_buffers (page); do { lock_buffer(bh); + clear_buffer_async_write(bh); clear_buffer_dirty(bh); clear_buffer_nilfs_volatile(bh); clear_buffer_nilfs_checked(bh);
fs/nilfs2/segment.c +9 -2
@@ -662,7 +662,7 @@ static size_t nilfs_lookup_dirty_data_buffers(struct inode *inode, bh = head =page_buffers (page); do { - if (!buffer_dirty(bh)) + if (!buffer_dirty(bh) || buffer_async_write(bh)) continue; get_bh(bh); list_add_tail(&bh->b_assoc_buffers, listp);
@@ -696,7 +696,8 @@ static void nilfs_lookup_dirty_node_buffers(struct inode *inode,for (i =0 ; i <pagevec_count (&pvec); i++) { bh = head =page_buffers (pvec.pages[i]); do { - if (buffer_dirty(bh)) { + if (buffer_dirty(bh) && + !buffer_async_write(bh)) { get_bh(bh); list_add_tail(&bh->b_assoc_buffers, listp);
@@ -1578,6 +1579,7 @@ static void nilfs_segctor_prepare_write(struct nilfs_sc_info *sci)list_for_each_entry (bh, &segbuf->sb_segsum_buffers, b_assoc_buffers) { +set_buffer_async_write (bh);if (bh->b_page != bd_page) {if (bd_page) {lock_page (bd_page);
@@ -1591,6 +1593,7 @@ static void nilfs_segctor_prepare_write(struct nilfs_sc_info *sci)list_for_each_entry (bh, &segbuf->sb_payload_buffers, b_assoc_buffers) { +set_buffer_async_write (bh);if (bh == segbuf->sb_super_root) {if (bh->b_page != bd_page) {lock_page (bd_page);
@@ -1676,6 +1679,7 @@ static void nilfs_abort_logs(struct list_head *logs, int err)list_for_each_entry (segbuf, logs, sb_list) {list_for_each_entry (bh, &segbuf->sb_segsum_buffers, b_assoc_buffers) { +clear_buffer_async_write (bh);if (bh->b_page != bd_page) {if (bd_page)end_page_writeback (bd_page);
@@ -1685,6 +1689,7 @@ static void nilfs_abort_logs(struct list_head *logs, int err)list_for_each_entry (bh, &segbuf->sb_payload_buffers, b_assoc_buffers) { +clear_buffer_async_write (bh);if (bh == segbuf->sb_super_root) {if (bh->b_page != bd_page) {end_page_writeback (bd_page);
@@ -1754,6 +1759,7 @@ static void nilfs_segctor_complete_write(struct nilfs_sc_info *sci) b_assoc_buffers) {set_buffer_uptodate (bh);clear_buffer_dirty (bh); +clear_buffer_async_write (bh);if (bh->b_page != bd_page) {if (bd_page)end_page_writeback (bd_page);
@@ -1775,6 +1781,7 @@ static void nilfs_segctor_complete_write(struct nilfs_sc_info *sci) b_assoc_buffers) {set_buffer_uptodate (bh);clear_buffer_dirty (bh); +clear_buffer_async_write (bh);clear_buffer_delay (bh);clear_buffer_nilfs_volatile (bh);clear_buffer_nilfs_redirected (bh);
fs/quota/dquot.c +11 -3
@@ -580,9 +580,17 @@ int dquot_scan_active(struct super_block *sb,dqstats_inc (DQST_LOOKUPS );dqput (old_dquot); old_dquot = dquot; - ret =fn (dquot, priv); -if (ret <0 ) - goto out; +/* +* ->release_dquot() can be racing with us. Our reference +* protects us from new calls to it so just wait for any +* outstanding call and recheck the DQ_ACTIVE_B after that. +*/ +wait_on_dquot (dquot); +if (test_bit (DQ_ACTIVE_B , &dquot->dq_flags)) { + ret =fn (dquot, priv); +if (ret <0 ) + goto out; + }spin_lock (&dq_list_lock);/* We are safe to continue now because our dquot could not * be moved out of the inuse list while we hold the reference */
fs/ubifs/orphan.c +4 -1
@@ -130,13 +130,14 @@ void ubifs_delete_orphan(struct ubifs_info *c, ino_t inum)else if (inum > o->inum) p = p->rb_right;else { -if (o->dnext) { +if (o->del) {spin_unlock (&c->orphan_lock);dbg_gen ("deleted twice ino %lu" , (unsigned long )inum);return ; }if (o->cnext) { + o->del =1 ; o->dnext = c->orph_dnext; c->orph_dnext = o;spin_unlock (&c->orphan_lock);
@@ -447,6 +448,7 @@ static void erase_deleted(struct ubifs_info *c) orphan = dnext; dnext = orphan->dnext;ubifs_assert (!orphan->new); +ubifs_assert (orphan->del);rb_erase (&orphan->rb, &c->orph_tree);list_del (&orphan->list); c->tot_orphans -=1 ;
@@ -536,6 +538,7 @@ static int insert_dead_orphan(struct ubifs_info *c, ino_t inum)rb_link_node (&orphan->rb, parent, p);rb_insert_color (&orphan->rb, &c->orph_tree);list_add_tail (&orphan->list, &c->orph_list); + orphan->del =1 ; orphan->dnext = c->orph_dnext; c->orph_dnext = orphan; dbg_mnt("ino %lu, new %d, tot %d", (unsigned long)inum,
fs/ubifs/ubifs.h +2 -0
@@ -905,6 +905,7 @@ struct ubifs_budget_req {* @dnext: next orphan to delete * @inum: inode number * @new: %1 => added since the last commit, otherwise %0 +* @del: %1 => delete pending, otherwise %0 */ struct ubifs_orphan {struct rb_node rb;
@@ -914,6 +915,7 @@ struct ubifs_orphan {struct ubifs_orphan *dnext;ino_t inum;int new; + unsigned del:1; };/**
include/linux/cgroup.h +45 -8
68 lines not on this page · raw message
include/linux/jbd2.h +1 -0
@@ -1178,6 +1178,7 @@ int __jbd2_log_start_commit(journal_t *journal, tid_t tid);int jbd2_journal_start_commit (journal_t *journal,tid_t *tid);int jbd2_journal_force_commit_nested (journal_t *journal);int jbd2_log_wait_commit (journal_t *journal,tid_t tid); +int jbd2_complete_transaction (journal_t *journal,tid_t tid);int jbd2_log_do_checkpoint (journal_t *journal);int jbd2_trans_will_send_data_barrier (journal_t *journal,tid_t tid);
include/linux/nbd.h +1 -0
@@ -68,6 +68,7 @@ struct nbd_device {u64 bytesize;pid_t pid;/* pid of nbd-client, if attached */ int xmit_timeout; + int disconnect; /* a disconnect has been requested by user */ };#endif
include/linux/skbuff.h +19 -0
@@ -2159,6 +2159,8 @@ extern int skb_shift(struct sk_buff *tgt, struct sk_buff *skb,extern struct sk_buff *skb_segment (struct sk_buff *skb,netdev_features_t features); +unsigned int skb_gso_transport_seglen (const struct sk_buff *skb); +static inline void *skb_header_pointer (const struct sk_buff *skb,int offset,int len,void *buffer) {
@@ -2580,5 +2582,22 @@ static inline bool skb_is_recycleable(const struct sk_buff *skb, int skb_size)return true; } + +/** +* skb_gso_network_seglen - Return length of individual segments of a gso packet +* +* @skb: GSO skb +* +* skb_gso_network_seglen is used to determine the real size of the +* individual segments, including Layer3 (IP, IPv6) and L4 headers (TCP/UDP). +* +* The MAC/L2 header is not accounted for. +*/ +static inline unsigned int skb_gso_network_seglen (const struct sk_buff *skb) +{ +unsigned int hdr_len =skb_transport_header (skb) - +skb_network_header (skb); +return hdr_len +skb_gso_transport_seglen (skb); +}#endif /* __KERNEL__ */ #endif /* _LINUX_SKBUFF_H */
include/xen/interface/io/netif.h +18 -0
@@ -13,6 +13,24 @@#include "../grant_table.h" /* +* Older implementation of Xen network frontend / backend has an +* implicit dependency on the MAX_SKB_FRAGS as the maximum number of +* ring slots a skb can use. Netfront / netback may not work as +* expected when frontend and backend have different MAX_SKB_FRAGS. +* +* A better approach is to add mechanism for netfront / netback to +* negotiate this value. However we cannot fix all possible +* frontends, so we need to define a value which states the minimum +* slots backend must support. +* +* The minimum value derives from older Linux kernel's MAX_SKB_FRAGS +* (18), which is proved to work with most frontends. Any new backend +* which doesn't negotiate with frontend should expect frontend to +* send a valid packet using slots up to this value. +*/ +#define XEN_NETIF_NR_SLOTS_MIN 18 + +/* * Notifications after enqueuing any type of message should be conditional on * the appropriate req_event or rsp_event field in the shared ring. * If the client sends notification for rx requests then it should specify
include/xen/interface/io/ring.h +5 -0
@@ -188,6 +188,11 @@ struct __name##_back_ring { \#define RING_REQUEST_CONS_OVERFLOW (_r, _cons) \ (((_cons) - (_r)->rsp_prod_pvt) >= RING_SIZE(_r)) +/* Ill-behaved frontend determination: Can there be this many requests? */ +#define RING_REQUEST_PROD_OVERFLOW (_r, _prod) \ + (((_prod) - (_r)->rsp_prod_pvt) > RING_SIZE(_r)) + +#define RING_PUSH_REQUESTS (_r) do { \ wmb();/* back sees requests /before/ updated producer index */ \ (_r)->sring->req_prod = (_r)->req_prod_pvt; \
kernel/cgroup.c +21 -29
69 lines not on this page · raw message
kernel/cgroup_freezer.c +4 -9
@@ -186,23 +186,15 @@ static void freezer_fork(struct task_struct *task) {struct freezer *freezer; -/* -* No lock is needed, since the task isn't on tasklist yet, -* so it can't be moved to another cgroup, which means the -* freezer won't be removed and will be valid during this -* function call. Nevertheless, apply RCU read-side critical -* section to suppress RCU lockdep false positives. -*/ rcu_read_lock (); freezer =task_freezer (task); -rcu_read_unlock ();/* * The root cgroup is non-freezable, so we can skip the * following check. */ if (!freezer->css.cgroup->parent) -return ; + goto out;spin_lock_irq (&freezer->lock);BUG_ON (freezer->state ==CGROUP_FROZEN );
@@ -210,7 +202,10 @@ static void freezer_fork(struct task_struct *task)/* Locking avoids race with FREEZING -> THAWED transitions. */ if (freezer->state ==CGROUP_FREEZING )freeze_task (task); +spin_unlock_irq (&freezer->lock); +out: +rcu_read_unlock (); }/*
kernel/events/core.c +6 -6
@@ -7149,14 +7149,14 @@ static void perf_pmu_rotate_stop(struct pmu *pmu)static void __perf_event_exit_context (void *__info) {struct perf_event_context *ctx = __info; -struct perf_event *event, *tmp; +struct perf_event *event;perf_pmu_rotate_stop (ctx->pmu); -list_for_each_entry_safe (event, tmp, &ctx->pinned_groups, group_entry) -__perf_remove_from_context (event); -list_for_each_entry_safe (event, tmp, &ctx->flexible_groups, group_entry) +rcu_read_lock (); +list_for_each_entry_rcu (event, &ctx->event_list, event_entry)__perf_remove_from_context (event); +rcu_read_unlock (); }static void perf_event_exit_cpu_context (int cpu)
@@ -7180,11 +7180,11 @@ static void perf_event_exit_cpu(int cpu) {struct swevent_htable *swhash = &per_cpu (swevent_htable, cpu); +perf_event_exit_cpu_context (cpu); +mutex_lock (&swhash->hlist_mutex);swevent_hlist_release (swhash);mutex_unlock (&swhash->hlist_mutex); - -perf_event_exit_cpu_context (cpu); }#else static inline void perf_event_exit_cpu (int cpu) { }
kernel/fork.c +1 -8
@@ -1124,7 +1124,6 @@ static struct task_struct *copy_process(unsigned long clone_flags, {int retval;struct task_struct *p; -int cgroup_callbacks_done =0 ;if ((clone_flags & (CLONE_NEWNS |CLONE_FS )) == (CLONE_NEWNS |CLONE_FS ))return ERR_PTR (-EINVAL );
@@ -1383,12 +1382,6 @@ static struct task_struct *copy_process(unsigned long clone_flags, p->group_leader = p;INIT_LIST_HEAD (&p->thread_group); -/* Now that the task is set up, run cgroup callbacks if -* necessary. We need to run them before the task is visible -* on the tasklist. */ -cgroup_fork_callbacks (p); - cgroup_callbacks_done =1 ; -/* Need tasklist lock for parent etc handling! */ write_lock_irq (&tasklist_lock);
@@ -1493,7 +1486,7 @@ bad_fork_cleanup_cgroup:#endif if (clone_flags &CLONE_THREAD )threadgroup_change_end (current); -cgroup_exit (p, cgroup_callbacks_done); +cgroup_exit (p,0 );delayacct_tsk_free (p);module_put (task_thread_info (p)->exec_domain->module); bad_fork_cleanup_count:
kernel/workqueue.c +7 -0
@@ -1469,12 +1469,19 @@ static void destroy_worker(struct worker *worker)if (worker->flags &WORKER_IDLE ) gcwq->nr_idle--; +/* +* Once WORKER_DIE is set, the kworker may destroy itself at any +* point. Pin to ensure the task stays until we're done with it. +*/ +get_task_struct (worker->task); +list_del_init (&worker->entry); worker->flags |=WORKER_DIE ;spin_unlock_irq (&gcwq->lock);kthread_stop (worker->task); +put_task_struct (worker->task);kfree (worker);spin_lock_irq (&gcwq->lock);
mm/memory_hotplug.c +8 -7
@@ -515,19 +515,20 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages) zone->present_pages += onlined_pages; zone->zone_pgdat->node_present_pages += onlined_pages; -if (need_zonelists_rebuild) -build_all_zonelists (zone); -else -zone_pcp_update (zone); +if (onlined_pages) { +node_set_state (zone_to_nid (zone),N_HIGH_MEMORY ); +if (need_zonelists_rebuild) +build_all_zonelists (zone); +else +zone_pcp_update (zone); + }mutex_unlock (&zonelists_mutex);init_per_zone_wmark_min (); -if (onlined_pages) { +if (onlined_pages)kswapd_run (zone_to_nid (zone)); -node_set_state (zone_to_nid (zone),N_HIGH_MEMORY ); - } vm_total_pages =nr_free_pagecache_pages ();
mm/vmscan.c +18 -9
@@ -2569,6 +2569,19 @@ static void age_active_anon(struct zone *zone, struct scan_control *sc, }while (memcg); } +static bool zone_balanced (struct zone *zone,int order, +unsigned long balance_gap,int classzone_idx) +{ +if (!zone_watermark_ok_safe (zone, order,high_wmark_pages (zone) + + balance_gap, classzone_idx,0 )) +return false; + +if (COMPACTION_BUILD && order && !compaction_suitable (zone, order)) +return false; + +return true; +} +
Lines of this file are not shown. View the raw message.
net/ipv4/ip_forward.c +66 -2
68 lines not on this page · raw message
net/sctp/socket.c +32 -9
41 lines not on this page · raw message
sound/soc/codecs/sta32x.c +37 -37
74 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.