Linux 3.9.7
Greg KH
maintainerI'm announcing the release of the 3.9.7 kernel.
All users of the 3.9 kernel series must upgrade.
The updated 3.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.9.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/mach-kirkwood/mpp.c | 5 arch/powerpc/include/asm/exception-64s.h | 2 arch/powerpc/kernel/exceptions-64s.S | 2 arch/powerpc/kernel/irq.c | 2 arch/powerpc/kernel/process.c | 4 arch/powerpc/kernel/traps.c | 10 + arch/x86/boot/compressed/eboot.c | 47 ---- arch/x86/include/asm/efi.h | 7 arch/x86/include/uapi/asm/bootparam.h | 1 arch/x86/kernel/relocate_kernel_64.S | 2 arch/x86/mm/init.c | 6 arch/x86/platform/efi/efi.c | 188 ++++++------------- drivers/acpi/scan.c | 5 drivers/acpi/video.c | 3 drivers/block/cciss.c | 32 +-- drivers/block/rbd.c | 10 - drivers/gpu/drm/gma500/cdv_intel_display.c | 14 + drivers/gpu/drm/gma500/psb_intel_display.c | 14 + drivers/gpu/drm/i915/intel_sdvo.c | 10 - drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c | 4 drivers/gpu/drm/nouveau/core/include/core/class.h | 2 drivers/gpu/drm/nouveau/nv50_display.c | 4 drivers/md/raid1.c | 38 ++- drivers/md/raid10.c | 29 +- drivers/md/raid5.c | 4 drivers/net/ethernet/broadcom/tg3.c | 10 + drivers/net/wireless/ath/ath9k/Kconfig | 10 - drivers/net/wireless/ath/ath9k/Makefile | 2 drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 10 - drivers/net/wireless/ath/ath9k/init.c | 7 drivers/net/wireless/ath/ath9k/rc.h | 2 drivers/net/wireless/b43/main.c | 2 drivers/net/wireless/ti/wl12xx/wl12xx.h | 2 drivers/rtc/rtc-twl.c | 1 drivers/usb/chipidea/core.c | 3 drivers/usb/serial/f81232.c | 8 drivers/usb/serial/pl2303.c | 10 - drivers/usb/serial/spcp8x5.c | 10 - fs/ceph/locks.c | 73 ++++--- fs/ceph/mds_client.c | 90 ++++----- fs/ceph/super.h | 9 fs/proc/kmsg.c | 10 - include/linux/ceph/auth.h | 18 + include/linux/cpu.h | 4 include/linux/swapops.h | 3 include/linux/syslog.h | 4 include/net/bluetooth/hci_core.h | 1 include/net/bluetooth/mgmt.h | 1 kernel/audit.c | 2 kernel/cpu.c | 55 ++--- kernel/printk.c | 91 +++++---- kernel/sys.c | 29 ++ mm/hugetlb.c | 2 mm/memcontrol.c | 2 mm/migrate.c | 23 +- mm/page_alloc.c | 6 mm/swap_state.c | 18 + net/bluetooth/hci_core.c | 6 net/bluetooth/l2cap_core.c | 70 +++++-- net/bluetooth/mgmt.c | 21 ++ net/ceph/auth.c | 117 ++++++++++- net/ceph/auth_x.c | 24 ++ net/ceph/auth_x.h | 1 net/ceph/messenger.c | 3 net/ceph/mon_client.c | 7 net/ceph/osd_client.c | 29 +- 67 files changed, 738 insertions(+), 505 deletions(-)
Alex Elder (2):
libceph: must hold mutex for reset_changed_osds()
rbd: don't destroy ceph_opts in rbd_add()
Alex Lyakas (1):
md/raid1: consider WRITE as successful only if at least one non-Faulty and non-rebuilding drive completed it.
Alexander Shishkin (1):
usb: chipidea: fix id change handling
Andrey Vagin (1):
memcg: don't initialize kmem-cache destroying work for root caches
Ben Skeggs (2):
drm/nv50/disp: force dac power state during load detect drm/nv50/kms: use dac loadval from vbios, where it's available
Benjamin Herrenschmidt (1):
powerpc: Fix missing/delayed calls to irq_work
Daniel Vetter (1):
drm/i915: prefer VBT modes for SVDO-LVDS over EDID
Felix Fietkau (1):
Revert "ath9k_hw: Update rx gain initval to improve rx sensitivity"
Greg Kroah-Hartman (1):
Linux 3.9.7
H. Peter Anvin (1):
md/raid1,5,10: Disable WRITE SAME until a recovery strategy is in place
Jim Schutt (2):
ceph: add cpu_to_le32() calls when encoding a reconnect capability
ceph: ceph_pagelist_append might sleep while atomic
Johan Hedberg (2):
Bluetooth: Fix missing length checks for L2CAP signalling PDUs
Bluetooth: Fix mgmt handling of power on failures
Johan Hovold (3):
USB: pl2303: fix device initialisation at open
USB: f81232: fix device initialisation at open
USB: spcp8x5: fix device initialisation at open
Kees Cook (3):
b43: stop format string leaking into error msgs
kmsg: honor dmesg_restrict sysctl on /dev/kmsg
x86: Fix typo in kexec register clearing
Luciano Coelho (1):
wl12xx: fix minimum required firmware version for wl127x multirole
Matthew Garrett (1):
Modify UEFI anti-bricking code
Michael Ellerman (1):
powerpc: Fix stack overflow crash in resume_kernel when ftracing
Naoya Horiguchi (1):
mm: migration: add migrate_entry_wait_huge()
NeilBrown (1):
md/raid1,raid10: use freeze_array in place of raise_barrier in various places.
Nicolas Schichan (1):
ARM: Kirkwood: handle mv88f6282 cpu in __kirkwood_variant().
Nithin Sujir (1):
tg3: Wait for boot code to finish after power on
Oleg Nesterov (1):
audit: wait_for_auditd() should use TASK_UNINTERRUPTIBLE
Patrik Jakobsson (2):
drm/gma500/psb: Unpin framebuffer on crtc disable drm/gma500/cdv: Unpin framebuffer on crtc disable
Paul Mackerras (1):
powerpc: Fix emulation of illegal instructions on PowerNV platform
Rafael Aquini (1):
swap: avoid read_swap_cache_async() race to deadlock while waiting on discard I/O completion
Rafael J. Wysocki (1):
ACPI / video: Do not bind to device objects with a scan handler
Robin Holt (1):
reboot: rigrate shutdown/reboot to boot cpu
Sage Weil (5):
libceph: clear messenger auth_retry flag when we authenticate
libceph: fix authorizer invalidation
libceph: add update_authorizer auth method
libceph: wrap auth ops in wrapper functions
libceph: wrap auth methods in a mutex
Srivatsa S. Bhat (1):
CPU hotplug: provide a generic helper to disable/enable CPU hotplug
Stephen M. Cameron (1):
cciss: fix broken mutex usage in ioctl
Sujith Manoharan (2):
ath9k: Disable PowerSave by default
ath9k: Use minstrel rate control by default
Tomasz Stanislawski (1):
mm/page_alloc.c: fix watermark check in __zone_watermark_ok()
Tony Lindgren (1):
drivers/rtc/rtc-twl.c: fix missing device_init_wakeup() when booted with device tree
Yinghai Lu (1):
x86: Fix adjust_range_size_mask calling position
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 9 -SUBLEVEL = 6 +SUBLEVEL = 7 EXTRAVERSION = NAME = Black Squirrel Wakeup Call
arch/arm/mach-kirkwood/mpp.c +3 -2
@@ -22,9 +22,10 @@ static unsigned int __init kirkwood_variant(void)kirkwood_pcie_id (&dev, &rev); -if ((dev ==MV88F6281_DEV_ID && rev >=MV88F6281_REV_A0 ) || - (dev ==MV88F6282_DEV_ID )) +if (dev ==MV88F6281_DEV_ID && rev >=MV88F6281_REV_A0 )return MPP_F6281_MASK ; +if (dev ==MV88F6282_DEV_ID ) +return MPP_F6282_MASK ;if (dev ==MV88F6192_DEV_ID && rev >=MV88F6192_REV_A0 )return MPP_F6192_MASK ;if (dev ==MV88F6180_DEV_ID )
arch/powerpc/include/asm/exception-64s.h +1 -1
@@ -513,7 +513,7 @@ label##_common: \*/ #define STD_EXCEPTION_COMMON_ASYNC (trap, label, hdlr) \ EXCEPTION_COMMON(trap, label, hdlr, ret_from_except_lite, \ - FINISH_NAP;RUNLATCH_ON;DISABLE_INTS) + FINISH_NAP;DISABLE_INTS;RUNLATCH_ON)/* * When the idle code in power4_idle puts the CPU into NAP mode,
arch/powerpc/kernel/exceptions-64s.S +1 -1
@@ -707,7 +707,7 @@ machine_check_common: STD_EXCEPTION_COMMON(0xb00, trap_0b, .unknown_exception) STD_EXCEPTION_COMMON(0xd00, single_step, .single_step_exception) STD_EXCEPTION_COMMON(0xe00, trap_0e, .unknown_exception) - STD_EXCEPTION_COMMON(0xe40, emulation_assist, .program_check_exception) + STD_EXCEPTION_COMMON(0xe40, emulation_assist, .emulation_assist_interrupt) STD_EXCEPTION_COMMON(0xe60, hmi_exception, .unknown_exception) #ifdef CONFIG_PPC_DOORBELL STD_EXCEPTION_COMMON_ASYNC(0xe80, h_doorbell, .doorbell_exception)
arch/powerpc/kernel/irq.c +1 -1
@@ -162,7 +162,7 @@ notrace unsigned int __check_irq_replay(void)* in case we also had a rollover while hard disabled */ local_paca->irq_happened &= ~PACA_IRQ_DEC ; -if (decrementer_check_overflow ()) +if ((happened &PACA_IRQ_DEC ) ||decrementer_check_overflow ())return 0x900 ;/* Finally check if an external interrupt happened */
arch/powerpc/kernel/process.c +2 -2
@@ -1371,7 +1371,7 @@ EXPORT_SYMBOL(dump_stack);#ifdef CONFIG_PPC64 /* Called with hard IRQs off */ -void __ppc64_runlatch_on (void ) +void notrace __ppc64_runlatch_on(void) {struct thread_info *ti =current_thread_info ();unsigned long ctrl;
@@ -1384,7 +1384,7 @@ void __ppc64_runlatch_on(void) }/* Called with hard IRQs off */ -void __ppc64_runlatch_off (void ) +void notrace __ppc64_runlatch_off(void) {struct thread_info *ti =current_thread_info ();unsigned long ctrl;
arch/powerpc/kernel/traps.c +10 -0
@@ -1142,6 +1142,16 @@ void __kprobes program_check_exception(struct pt_regs *regs)_exception (SIGILL , regs,ILL_ILLOPC , regs->nip); } +/* +* This occurs when running in hypervisor mode on POWER6 or later +* and an illegal instruction is encountered. +*/ +void __kprobes emulation_assist_interrupt (struct pt_regs *regs) +{ + regs->msr |=REASON_ILLEGAL ; +program_check_exception (regs); +} +void alignment_exception (struct pt_regs *regs) {int sig, code, fixed =0 ;
arch/x86/boot/compressed/eboot.c +0 -47
59 lines not on this page · raw message
arch/x86/include/asm/efi.h +0 -7
@@ -102,13 +102,6 @@ extern void efi_call_phys_epilog(void);extern void efi_unmap_memmap (void );extern void efi_memory_uc (u64 addr,unsigned long size); -struct efi_var_bootdata { -struct setup_data data; -u64 store_size; -u64 remaining_size; -u64 max_var_size; -}; -#ifdef CONFIG_EFI static inline bool efi_is_native (void )
arch/x86/include/uapi/asm/bootparam.h +0 -1
@@ -6,7 +6,6 @@#define SETUP_E820_EXT 1#define SETUP_DTB 2#define SETUP_PCI 3 -#define SETUP_EFI_VARS 4/* ram_size flags */ #define RAMDISK_IMAGE_START_MASK 0x07FF
arch/x86/kernel/relocate_kernel_64.S +1 -1
@@ -160,7 +160,7 @@ identity_mapped: xorq %rbp, %rbp xorq %r8, %r8 xorq %r9, %r9 - xorq %r10, %r9 + xorq %r10, %r10 xorq %r11, %r11 xorq %r12, %r12 xorq %r13, %r13
arch/x86/mm/init.c +3 -3
@@ -277,6 +277,9 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range, end_pfn = limit_pfn; nr_range =save_mr (mr, nr_range, start_pfn, end_pfn,0 ); +if (!after_bootmem) +adjust_range_page_size_mask (mr, nr_range); +/* try to merge same page size and continuous */ for (i =0 ; nr_range >1 && i < nr_range -1 ; i++) {unsigned long old_start;
@@ -291,9 +294,6 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range, nr_range--; } -if (!after_bootmem) -adjust_range_page_size_mask (mr, nr_range); -for (i =0 ; i < nr_range; i++) printk(KERN_DEBUG " [mem %#010lx-%#010lx] page %s\n", mr[i].start, mr[i].end - 1,
arch/x86/platform/efi/efi.c +65 -123
254 lines not on this page · raw message
drivers/acpi/scan.c +1 -4
@@ -830,11 +830,8 @@ acpi_bus_driver_init(struct acpi_device *device, struct acpi_driver *driver)return -ENOSYS ; result = driver->ops.add (device); -if (result) { - device->driver =NULL ; - device->driver_data =NULL ; +if (result)return result; - } device->driver = driver;
drivers/acpi/video.c +3 -0
@@ -1646,6 +1646,9 @@ static int acpi_video_bus_add(struct acpi_device *device)int error;acpi_status status; +if (device->handler) +return -EINVAL ; + status = acpi_walk_namespace(ACPI_TYPE_DEVICE, device->parent->handle, 1, acpi_video_bus_match, NULL,
drivers/block/cciss.c +16 -16
@@ -162,8 +162,6 @@ static irqreturn_t do_cciss_msix_intr(int irq, void *dev_id);static int cciss_open (struct block_device *bdev,fmode_t mode);static int cciss_unlocked_open (struct block_device *bdev,fmode_t mode);static int cciss_release (struct gendisk *disk,fmode_t mode); -static int do_ioctl (struct block_device *bdev,fmode_t mode, -unsigned int cmd,unsigned long arg);static int cciss_ioctl (struct block_device *bdev,fmode_t mode,unsigned int cmd,unsigned long arg);static int cciss_getgeo (struct block_device *bdev,struct hd_geometry *geo);
@@ -229,7 +227,7 @@ static const struct block_device_operations cciss_fops = { .owner = THIS_MODULE, .open = cciss_unlocked_open, .release = cciss_release, - .ioctl = do_ioctl, + .ioctl = cciss_ioctl, .getgeo = cciss_getgeo, #ifdef CONFIG_COMPAT .compat_ioctl = cciss_compat_ioctl,
@@ -1138,16 +1136,6 @@ static int cciss_release(struct gendisk *disk, fmode_t mode)return 0 ; } -static int do_ioctl (struct block_device *bdev,fmode_t mode, -unsigned cmd,unsigned long arg) -{ -int ret; -mutex_lock (&cciss_mutex); - ret =cciss_ioctl (bdev, mode, cmd, arg); -mutex_unlock (&cciss_mutex); -return ret; -} -#ifdef CONFIG_COMPAT static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
@@ -1174,7 +1162,7 @@ static int cciss_compat_ioctl(struct block_device *bdev, fmode_t mode,case CCISS_REGNEWD :case CCISS_RESCANDISK :case CCISS_GETLUNINFO : -return do_ioctl (bdev, mode, cmd, arg); +return cciss_ioctl (bdev, mode, cmd, arg);case CCISS_PASSTHRU32 :return cciss_ioctl32_passthru (bdev, mode, cmd, arg);
@@ -1214,7 +1202,7 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,if (err)return -EFAULT ; - err =do_ioctl (bdev, mode,CCISS_PASSTHRU , (unsigned long )p); + err =cciss_ioctl (bdev, mode,CCISS_PASSTHRU , (unsigned long )p);if (err)return err; err |=
@@ -1256,7 +1244,7 @@ static int cciss_ioctl32_big_passthru(struct block_device *bdev, fmode_t mode,if (err)return -EFAULT ; - err =do_ioctl (bdev, mode,CCISS_BIG_PASSTHRU , (unsigned long )p); + err =cciss_ioctl (bdev, mode,CCISS_BIG_PASSTHRU , (unsigned long )p);if (err)return err; err |=
@@ -1306,11 +1294,14 @@ static int cciss_getpciinfo(ctlr_info_t *h, void __user *argp)static int cciss_getintinfo (ctlr_info_t *h,void __user *argp) {cciss_coalint_struct intinfo; +unsigned long flags;if (!argp)return -EINVAL ; +spin_lock_irqsave (&h->lock, flags); intinfo.delay =readl (&h->cfgtable->HostWrite.CoalIntDelay); intinfo.count =readl (&h->cfgtable->HostWrite.CoalIntCount); +spin_unlock_irqrestore (&h->lock, flags);if (copy_to_user (argp, &intinfo,sizeof (cciss_coalint_struct)))return -EFAULT ;
@@ -1351,12 +1342,15 @@ static int cciss_setintinfo(ctlr_info_t *h, void __user *argp)static int cciss_getnodename (ctlr_info_t *h,void __user *argp) {NodeName_type NodeName; +unsigned long flags;int i;if (!argp)return -EINVAL ; +spin_lock_irqsave (&h->lock, flags);for (i =0 ; i <16 ; i++) NodeName[i] =readb (&h->cfgtable->ServerName[i]); +spin_unlock_irqrestore (&h->lock, flags);if (copy_to_user (argp, NodeName,sizeof (NodeName_type)))return -EFAULT ;return 0 ;
@@ -1393,10 +1387,13 @@ static int cciss_setnodename(ctlr_info_t *h, void __user *argp)static int cciss_getheartbeat (ctlr_info_t *h,void __user *argp) {Heartbeat_type heartbeat; +unsigned long flags;if (!argp)return -EINVAL ; +spin_lock_irqsave (&h->lock, flags); heartbeat =readl (&h->cfgtable->HeartBeat); +spin_unlock_irqrestore (&h->lock, flags);if (copy_to_user (argp, &heartbeat,sizeof (Heartbeat_type)))return -EFAULT ;return 0 ;
@@ -1405,10 +1402,13 @@ static int cciss_getheartbeat(ctlr_info_t *h, void __user *argp)static int cciss_getbustypes (ctlr_info_t *h,void __user *argp) {BusTypes_type BusTypes; +unsigned long flags;if (!argp)return -EINVAL ; +spin_lock_irqsave (&h->lock, flags); BusTypes =readl (&h->cfgtable->BusTypes); +spin_unlock_irqrestore (&h->lock, flags);if (copy_to_user (argp, &BusTypes,sizeof (BusTypes_type)))return -EFAULT ;return 0 ;
drivers/block/rbd.c +4 -6
@@ -435,8 +435,8 @@ static const struct block_device_operations rbd_bd_ops = { };/* -* Initialize an rbd client instance. -* We own *ceph_opts. +* Initialize an rbd client instance. Success or not, this function +* consumes ceph_opts. */ static struct rbd_client *rbd_client_create (struct ceph_options *ceph_opts) {
@@ -583,7 +583,8 @@ static int parse_rbd_opts_token(char *c, void *private)/* * Get a ceph client with specific addr and configuration, if one does -* not exist create it. +* not exist create it. Either way, ceph_opts is consumed by this +* function. */ static struct rbd_client *rbd_get_client (struct ceph_options *ceph_opts) {
@@ -4104,7 +4105,6 @@ static ssize_t rbd_add(struct bus_type *bus, rc =PTR_ERR (rbdc); goto err_out_args; } - ceph_opts =NULL ;/* rbd_dev client now owns this */ /* pick the pool */ osdc = &rbdc->client->osdc;
@@ -4140,8 +4140,6 @@ err_out_rbd_dev: err_out_client:rbd_put_client (rbdc); err_out_args: -if (ceph_opts) -ceph_destroy_options (ceph_opts);kfree (rbd_opts);rbd_spec_put (spec); err_out_module:
drivers/gpu/drm/gma500/cdv_intel_display.c +14 -0
@@ -1750,6 +1750,19 @@ static void cdv_intel_crtc_destroy(struct drm_crtc *crtc)kfree (psb_intel_crtc); } +static void cdv_intel_crtc_disable (struct drm_crtc *crtc) +{ +struct gtt_range *gt; +struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; + + crtc_funcs->dpms (crtc,DRM_MODE_DPMS_OFF ); + +if (crtc->fb) { + gt =to_psb_fb (crtc->fb)->gtt; +psb_gtt_unpin (gt); + } +} +const struct drm_crtc_helper_funcs cdv_intel_helper_funcs = { .dpms = cdv_intel_crtc_dpms, .mode_fixup = cdv_intel_crtc_mode_fixup,
@@ -1757,6 +1770,7 @@ const struct drm_crtc_helper_funcs cdv_intel_helper_funcs = { .mode_set_base = cdv_intel_pipe_set_base, .prepare = cdv_intel_crtc_prepare, .commit = cdv_intel_crtc_commit, + .disable = cdv_intel_crtc_disable, };const struct drm_crtc_funcs cdv_intel_crtc_funcs = {
drivers/gpu/drm/gma500/psb_intel_display.c +14 -0
@@ -1246,6 +1246,19 @@ void psb_intel_crtc_destroy(struct drm_crtc *crtc)kfree (psb_intel_crtc); } +static void psb_intel_crtc_disable (struct drm_crtc *crtc) +{ +struct gtt_range *gt; +struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; + + crtc_funcs->dpms (crtc,DRM_MODE_DPMS_OFF ); + +if (crtc->fb) { + gt =to_psb_fb (crtc->fb)->gtt; +psb_gtt_unpin (gt); + } +} +const struct drm_crtc_helper_funcs psb_intel_helper_funcs = { .dpms = psb_intel_crtc_dpms, .mode_fixup = psb_intel_crtc_mode_fixup,
@@ -1253,6 +1266,7 @@ const struct drm_crtc_helper_funcs psb_intel_helper_funcs = { .mode_set_base = psb_intel_pipe_set_base, .prepare = psb_intel_crtc_prepare, .commit = psb_intel_crtc_commit, + .disable = psb_intel_crtc_disable, };const struct drm_crtc_funcs psb_intel_crtc_funcs = {
drivers/gpu/drm/i915/intel_sdvo.c +6 -4
@@ -1771,10 +1771,13 @@ static void intel_sdvo_get_lvds_modes(struct drm_connector *connector)* arranged in priority order. */ intel_ddc_get_modes (connector, &intel_sdvo->ddc); -if (list_empty (&connector->probed_modes) == false) - goto end; -/* Fetch modes from VBT */ +/* +* Fetch modes from VBT. For SDVO prefer the VBT mode since some +* SDVO->LVDS transcoders can't cope with the EDID mode. Since +* drm_mode_probed_add adds the mode at the head of the list we add it +* last. +*/ if (dev_priv->sdvo_lvds_vbt_mode !=NULL ) { newmode =drm_mode_duplicate (connector->dev, dev_priv->sdvo_lvds_vbt_mode);
@@ -1786,7 +1789,6 @@ static void intel_sdvo_get_lvds_modes(struct drm_connector *connector) } } -end:list_for_each_entry (newmode, &connector->probed_modes, head) {if (newmode->type &DRM_MODE_TYPE_PREFERRED ) { intel_sdvo->sdvo_lvds_fixed_mode =
drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c +4 -0
@@ -50,11 +50,15 @@ nv50_dac_sense(struct nv50_disp_priv *priv, int or, u32 loadval) {const u32 doff = (or *0x800 );int load = -EINVAL ; +nv_mask (priv,0x61a004 + doff,0x807f0000 ,0x80150000 ); +nv_wait (priv,0x61a004 + doff,0x80000000 ,0x00000000 );nv_wr32 (priv,0x61a00c + doff,0x00100000 | loadval);udelay (9500 );nv_wr32 (priv,0x61a00c + doff,0x80000000 ); load = (nv_rd32 (priv,0x61a00c + doff) &0x38000000 ) >>27 ;nv_wr32 (priv,0x61a00c + doff,0x00000000 ); +nv_mask (priv,0x61a004 + doff,0x807f0000 ,0x80550000 ); +nv_wait (priv,0x61a004 + doff,0x80000000 ,0x00000000 );return load; }
drivers/gpu/drm/nouveau/core/include/core/class.h +1 -1
@@ -216,7 +216,7 @@ struct nv04_display_class {#define NV50_DISP_DAC_PWR_STATE 0x00000040#define NV50_DISP_DAC_PWR_STATE_ON 0x00000000#define NV50_DISP_DAC_PWR_STATE_OFF 0x00000040 -#define NV50_DISP_DAC_LOAD 0x0002000c +#define NV50_DISP_DAC_LOAD 0x00020100#define NV50_DISP_DAC_LOAD_VALUE 0x00000007#define NV50_DISP_PIOR_MTHD 0x00030000
drivers/gpu/drm/nouveau/nv50_display.c +3 -1
@@ -1554,7 +1554,9 @@ nv50_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector) {struct nv50_disp *disp =nv50_disp (encoder->dev);int ret, or =nouveau_encoder (encoder)->or; -u32 load =0 ; +u32 load =nouveau_drm (encoder->dev)->vbios.dactestval; +if (load ==0 ) + load =340 ; ret =nv_exec (disp->core,NV50_DISP_DAC_LOAD + or, &load,sizeof (load));if (ret || load !=7 )
drivers/md/raid1.c +24 -14
@@ -427,7 +427,17 @@ static void raid1_end_write_request(struct bio *bio, int error) r1_bio->bios[mirror] =NULL ; to_put = bio; -set_bit (R1BIO_Uptodate, &r1_bio->state); +/* +* Do not set R1BIO_Uptodate if the current device is +* rebuilding or Faulty. This is because we cannot use +* such device for properly reading the data back (we could +* potentially use it, if the current write would have felt +* before rdev->recovery_offset, but for simplicity we don't +* check this here. +*/ +if (test_bit (In_sync, &conf->mirrors[mirror].rdev->flags) && + !test_bit (Faulty, &conf->mirrors[mirror].rdev->flags)) +set_bit (R1BIO_Uptodate, &r1_bio->state);/* Maybe we can clear some bad blocks. */ if (is_badblock(conf->mirrors[mirror].rdev,
@@ -880,17 +890,17 @@ static void allow_barrier(struct r1conf *conf)wake_up (&conf->wait_barrier); } -static void freeze_array (struct r1conf *conf) +static void freeze_array (struct r1conf *conf,int extra) {/* stop syncio and normal IO and wait for everything to * go quite. * We increment barrier and nr_waiting, and then -* wait until nr_pending match nr_queued+1 +* wait until nr_pending match nr_queued+extra * This is called in the context of one normal IO request * that has failed. Thus any sync request that might be pending * will be blocked by nr_pending, and we need to wait for * pending IO requests to complete or be queued for re-try. -* Thus the number queued (nr_queued) plus this request (1) +* Thus the number queued (nr_queued) plus this request (extra) * must match the number of pending IOs (nr_pending) before * we continue. */
@@ -898,7 +908,7 @@ static void freeze_array(struct r1conf *conf) conf->barrier++; conf->nr_waiting++;wait_event_lock_irq_cmd (conf->wait_barrier, - conf->nr_pending == conf->nr_queued+1 , + conf->nr_pending == conf->nr_queued+extra, conf->resync_lock,flush_pending_writes (conf));spin_unlock_irq (&conf->resync_lock);
@@ -1558,8 +1568,8 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev)* we wait for all outstanding requests to complete. */ synchronize_sched (); -raise_barrier (conf); -lower_barrier (conf); +freeze_array (conf,0 ); +unfreeze_array (conf);clear_bit (Unmerged, &rdev->flags); }md_integrity_add_rdev (rdev, mddev);
@@ -1609,11 +1619,11 @@ static int raid1_remove_disk(struct mddev *mddev, struct md_rdev *rdev)*/ struct md_rdev *repl = conf->mirrors[conf->raid_disks + number].rdev; -raise_barrier (conf); +freeze_array (conf,0 );clear_bit (Replacement, &repl->flags); p->rdev = repl; conf->mirrors[conf->raid_disks + number].rdev =NULL ; -lower_barrier (conf); +unfreeze_array (conf);clear_bit (WantReplacement, &rdev->flags); }else clear_bit (WantReplacement, &rdev->flags);
@@ -2230,7 +2240,7 @@ static void handle_read_error(struct r1conf *conf, struct r1bio *r1_bio)* frozen */ if (mddev->ro ==0 ) { -freeze_array (conf); +freeze_array (conf,1 );fix_read_error (conf, r1_bio->read_disk, r1_bio->sector, r1_bio->sectors);unfreeze_array (conf);
@@ -2827,8 +2837,8 @@ static int run(struct mddev *mddev)return PTR_ERR (conf);if (mddev->queue) -blk_queue_max_write_same_sectors (mddev->queue, - mddev->chunk_sectors); +blk_queue_max_write_same_sectors (mddev->queue,0 ); +rdev_for_each (rdev, mddev) {if (!mddev->gendisk)continue ;
@@ -3009,7 +3019,7 @@ static int raid1_reshape(struct mddev *mddev)return -ENOMEM ; } -raise_barrier (conf); +freeze_array (conf,0 );/* ok, everything is stopped */ oldpool = conf->r1bio_pool;
@@ -3040,7 +3050,7 @@ static int raid1_reshape(struct mddev *mddev) conf->raid_disks = mddev->raid_disks = raid_disks; mddev->delta_disks =0 ; -lower_barrier (conf); +unfreeze_array (conf);set_bit (MD_RECOVERY_NEEDED , &mddev->recovery);md_wakeup_thread (mddev->thread);
drivers/md/raid10.c +19 -10
@@ -490,7 +490,17 @@ static void raid10_end_write_request(struct bio *bio, int error)sector_t first_bad;int bad_sectors; -set_bit (R10BIO_Uptodate, &r10_bio->state); +/* +* Do not set R10BIO_Uptodate if the current device is +* rebuilding or Faulty. This is because we cannot use +* such device for properly reading the data back (we could +* potentially use it, if the current write would have felt +* before rdev->recovery_offset, but for simplicity we don't +* check this here. +*/ +if (test_bit (In_sync, &rdev->flags) && + !test_bit (Faulty, &rdev->flags)) +set_bit (R10BIO_Uptodate, &r10_bio->state);/* Maybe we can clear some bad blocks. */ if (is_badblock(rdev,
@@ -1055,17 +1065,17 @@ static void allow_barrier(struct r10conf *conf)wake_up (&conf->wait_barrier); } -static void freeze_array (struct r10conf *conf) +static void freeze_array (struct r10conf *conf,int extra) {/* stop syncio and normal IO and wait for everything to * go quiet. * We increment barrier and nr_waiting, and then -* wait until nr_pending match nr_queued+1 +* wait until nr_pending match nr_queued+extra * This is called in the context of one normal IO request * that has failed. Thus any sync request that might be pending * will be blocked by nr_pending, and we need to wait for * pending IO requests to complete or be queued for re-try. -* Thus the number queued (nr_queued) plus this request (1) +* Thus the number queued (nr_queued) plus this request (extra) * must match the number of pending IOs (nr_pending) before * we continue. */
@@ -1073,7 +1083,7 @@ static void freeze_array(struct r10conf *conf) conf->barrier++; conf->nr_waiting++;wait_event_lock_irq_cmd (conf->wait_barrier, - conf->nr_pending == conf->nr_queued+1 , + conf->nr_pending == conf->nr_queued+extra, conf->resync_lock,flush_pending_writes (conf));
@@ -1839,8 +1849,8 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev)* we wait for all outstanding requests to complete. */ synchronize_sched (); -raise_barrier (conf,0 ); -lower_barrier (conf); +freeze_array (conf,0 ); +unfreeze_array (conf);clear_bit (Unmerged, &rdev->flags); }md_integrity_add_rdev (rdev, mddev);
@@ -2636,7 +2646,7 @@ static void handle_read_error(struct mddev *mddev, struct r10bio *r10_bio) r10_bio->devs[slot].bio =NULL ;if (mddev->ro ==0 ) { -freeze_array (conf); +freeze_array (conf,1 );fix_read_error (conf, mddev, r10_bio);unfreeze_array (conf); }else
@@ -3625,8 +3635,7 @@ static int run(struct mddev *mddev)if (mddev->queue) {blk_queue_max_discard_sectors (mddev->queue, mddev->chunk_sectors); -blk_queue_max_write_same_sectors (mddev->queue, - mddev->chunk_sectors); +blk_queue_max_write_same_sectors (mddev->queue,0 );blk_queue_io_min (mddev->queue, chunk_size);if (conf->geo.raid_disks % conf->geo.near_copies)blk_queue_io_opt (mddev->queue, chunk_size * conf->geo.raid_disks);
drivers/md/raid5.c +3 -1
@@ -5457,7 +5457,7 @@ static int run(struct mddev *mddev)if (mddev->major_version ==0 && mddev->minor_version >90 ) rdev->recovery_offset = reshape_offset; - + if (rdev->recovery_offset < reshape_offset) { /* We need to check old and new layout */ if (!only_parity(rdev->raid_disk,
@@ -5580,6 +5580,8 @@ static int run(struct mddev *mddev)*/ mddev->queue->limits.discard_zeroes_data =0 ; +blk_queue_max_write_same_sectors (mddev->queue,0 ); +rdev_for_each (rdev, mddev) {disk_stack_limits (mddev->gendisk, rdev->bdev, rdev->data_offset <<9 );
drivers/net/ethernet/broadcom/tg3.c +10 -0
@@ -1799,6 +1799,9 @@ static int tg3_poll_fw(struct tg3 *tp)int i;u32 val; +if (tg3_flag (tp,NO_FWARE_REPORTED )) +return 0 ; +if (tg3_flag (tp,IS_SSB_CORE )) {/* We don't use firmware. */ return 0 ;
@@ -10016,6 +10019,13 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)*/ static int tg3_init_hw (struct tg3 *tp,int reset_phy) { +/* Chip may have been just powered on. If so, the boot code may still +* be running initialization. Wait for it to finish to avoid races in +* accessing the hardware. +*/ +tg3_enable_register_access (tp); +tg3_poll_fw (tp); +tg3_switch_clocks (tp);tw32 (TG3PCI_MEM_WIN_BASE_ADDR ,0 );
drivers/net/wireless/ath/ath9k/Kconfig +7 -3
@@ -92,13 +92,17 @@ config ATH9K_MAC_DEBUG This option enables collection of statistics for Rx/Tx status data and some other MAC related statistics -config ATH9K_RATE_CONTROL +config ATH9K_LEGACY_RATE_CONTROL bool "Atheros ath9k rate control" depends on ATH9K - default y + default n ---help--- Say Y, if you want to use the ath9k specific rate control - module instead of minstrel_ht. + module instead of minstrel_ht. Be warned that there are various + issues with the ath9k RC and minstrel is a more robust algorithm. + Note that even if this option is selected, "ath9k_rate_control" + has to be passed to mac80211 using the module parameter, + ieee80211_default_rc_algo. config ATH9K_HTC tristate "Atheros HTC based wireless cards support"
drivers/net/wireless/ath/ath9k/Makefile +1 -1
@@ -8,7 +8,7 @@ ath9k-y += beacon.o \ antenna.o ath9k-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += mci.o -ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o +ath9k-$(CONFIG_ATH9K_LEGACY_RATE_CONTROL) += rc.o ath9k-$(CONFIG_ATH9K_PCI) += pci.o ath9k-$(CONFIG_ATH9K_AHB) += ahb.o ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o
drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h +5 -5
@@ -958,11 +958,11 @@ static const u32 ar9300Common_rx_gain_table_2p2[][2] = { {0x0000a074, 0x00000000}, {0x0000a078, 0x00000000}, {0x0000a07c, 0x00000000}, - {0x0000a080, 0x1a1a1a1a}, - {0x0000a084, 0x1a1a1a1a}, - {0x0000a088, 0x1a1a1a1a}, - {0x0000a08c, 0x1a1a1a1a}, - {0x0000a090, 0x171a1a1a}, + {0x0000a080, 0x22222229}, + {0x0000a084, 0x1d1d1d1d}, + {0x0000a088, 0x1d1d1d1d}, + {0x0000a08c, 0x1d1d1d1d}, + {0x0000a090, 0x171d1d1d}, {0x0000a094, 0x11111717}, {0x0000a098, 0x00030311}, {0x0000a09c, 0x00000000},
drivers/net/wireless/ath/ath9k/init.c +1 -6
@@ -766,8 +766,7 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) hw->wiphy->iface_combinations = &if_comb; hw->wiphy->n_iface_combinations =1 ; -if (AR_SREV_5416 (sc->sc_ah)) - hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT ; + hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT ; hw->wiphy->flags |=WIPHY_FLAG_IBSS_RSN ; hw->wiphy->flags |=WIPHY_FLAG_SUPPORTS_TDLS ;
@@ -809,10 +808,6 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) sc->ant_rx = hw->wiphy->available_antennas_rx; sc->ant_tx = hw->wiphy->available_antennas_tx; -#ifdef CONFIG_ATH9K_RATE_CONTROL - hw->rate_control_algorithm ="ath9k_rate_control" ; -#endif -if (sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_2GHZ ) hw->wiphy->bands[IEEE80211_BAND_2GHZ ] = &sc->sbands[IEEE80211_BAND_2GHZ ];
drivers/net/wireless/ath/ath9k/rc.h +1 -1
@@ -231,7 +231,7 @@ static inline void ath_debug_stat_retries(struct ath_rate_priv *rc, int rix, }#endif -#ifdef CONFIG_ATH9K_RATE_CONTROL +#ifdef CONFIG_ATH9K_LEGACY_RATE_CONTROL int ath_rate_control_register (void );void ath_rate_control_unregister (void );#else
drivers/net/wireless/b43/main.c +1 -1
@@ -2451,7 +2451,7 @@ static void b43_request_firmware(struct work_struct *work)for (i =0 ; i <B43_NR_FWTYPES ; i++) { errmsg = ctx->errors[i];if (strlen (errmsg)) -b43err (dev->wl, errmsg); +b43err (dev->wl,"%s" , errmsg); }b43_print_fw_helptext (dev->wl,1 ); goto out;
drivers/net/wireless/ti/wl12xx/wl12xx.h +1 -1
@@ -41,7 +41,7 @@#define WL127X_IFTYPE_MR_VER 5#define WL127X_MAJOR_MR_VER 7#define WL127X_SUBTYPE_MR_VER WLCORE_FW_VER_IGNORE -#define WL127X_MINOR_MR_VER 115 +#define WL127X_MINOR_MR_VER 42/* FW chip version for wl128x */ #define WL128X_CHIP_VER 7
drivers/rtc/rtc-twl.c +1 -0
@@ -524,6 +524,7 @@ static int twl_rtc_probe(struct platform_device *pdev) }platform_set_drvdata (pdev, rtc); +device_init_wakeup (&pdev->dev,1 );return 0 ; out2:
drivers/usb/chipidea/core.c +2 -1
@@ -279,8 +279,9 @@ static void ci_role_work(struct work_struct *work)ci_role_stop (ci);ci_role_start (ci, role); -enable_irq (ci->irq); } + +enable_irq (ci->irq); } static ssize_t show_role(struct device *dev, struct device_attribute *attr,
drivers/usb/serial/f81232.c +4 -4
@@ -165,11 +165,12 @@ static void f81232_set_termios(struct tty_struct *tty,/* FIXME - Stubbed out for now */ /* Don't change anything if nothing has changed */ -if (!tty_termios_hw_change (&tty->termios, old_termios)) +if (old_termios && !tty_termios_hw_change (&tty->termios, old_termios))return ;/* Do the real work here... */ -tty_termios_copy_hw (&tty->termios, old_termios); +if (old_termios) +tty_termios_copy_hw (&tty->termios, old_termios); }static int f81232_tiocmget (struct tty_struct *tty)
@@ -187,12 +188,11 @@ static int f81232_tiocmset(struct tty_struct *tty,static int f81232_open (struct tty_struct *tty,struct usb_serial_port *port) { -struct ktermios tmp_termios;int result;/* Setup termios */ if (tty) -f81232_set_termios (tty, port, &tmp_termios); +f81232_set_termios (tty, port,NULL ); result =usb_submit_urb (port->interrupt_in_urb,GFP_KERNEL );if (result) {
drivers/usb/serial/pl2303.c +5 -5
@@ -283,7 +283,7 @@ static void pl2303_set_termios(struct tty_struct *tty,serial settings even to the same values as before. Thus we actually need to filter in this specific case */ -if (!tty_termios_hw_change (&tty->termios, old_termios)) +if (old_termios && !tty_termios_hw_change (&tty->termios, old_termios))return ; cflag = tty->termios.c_cflag;
@@ -292,7 +292,8 @@ static void pl2303_set_termios(struct tty_struct *tty,if (!buf) {dev_err (&port->dev,"%s - out of memory.\n" , __func__);/* Report back no change occurred */ - tty->termios = *old_termios; +if (old_termios) + tty->termios = *old_termios;return ; }
@@ -432,7 +433,7 @@ static void pl2303_set_termios(struct tty_struct *tty, control = priv->line_control;if ((cflag &CBAUD ) ==B0 ) priv->line_control &= ~(CONTROL_DTR |CONTROL_RTS ); -else if ((old_termios->c_cflag &CBAUD ) ==B0 ) +else if (old_termios && (old_termios->c_cflag &CBAUD ) ==B0 ) priv->line_control |= (CONTROL_DTR |CONTROL_RTS );if (control != priv->line_control) { control = priv->line_control;
@@ -491,7 +492,6 @@ static void pl2303_close(struct usb_serial_port *port)static int pl2303_open (struct tty_struct *tty,struct usb_serial_port *port) { -struct ktermios tmp_termios;struct usb_serial *serial = port->serial;struct pl2303_serial_private *spriv =usb_get_serial_data (serial);int result;
@@ -507,7 +507,7 @@ static int pl2303_open(struct tty_struct *tty, struct usb_serial_port *port)/* Setup termios */ if (tty) -pl2303_set_termios (tty, port, &tmp_termios); +pl2303_set_termios (tty, port,NULL ); result =usb_submit_urb (port->interrupt_in_urb,GFP_KERNEL );if (result) {
drivers/usb/serial/spcp8x5.c +4 -6
@@ -314,7 +314,6 @@ static void spcp8x5_set_termios(struct tty_struct *tty,struct spcp8x5_private *priv =usb_get_serial_port_data (port);unsigned long flags;unsigned int cflag = tty->termios.c_cflag; -unsigned int old_cflag = old_termios->c_cflag;unsigned short uartdata;unsigned char buf[2 ] = {0 ,0 };int baud;
@@ -323,15 +322,15 @@ static void spcp8x5_set_termios(struct tty_struct *tty,/* check that they really want us to change something */ -if (!tty_termios_hw_change (&tty->termios, old_termios)) +if (old_termios && !tty_termios_hw_change (&tty->termios, old_termios))return ;/* set DTR/RTS active */ spin_lock_irqsave (&priv->lock, flags); control = priv->line_control; -if ((old_cflag &CBAUD ) ==B0 ) { +if (old_termios && (old_termios->c_cflag &CBAUD ) ==B0 ) { priv->line_control |=MCR_DTR ; -if (!(old_cflag &CRTSCTS )) +if (!(old_termios->c_cflag &CRTSCTS )) priv->line_control |=MCR_RTS ; }if (control != priv->line_control) {
@@ -421,7 +420,6 @@ static void spcp8x5_set_termios(struct tty_struct *tty,* status of the device. */ static int spcp8x5_open (struct tty_struct *tty,struct usb_serial_port *port) { -struct ktermios tmp_termios;struct usb_serial *serial = port->serial;struct spcp8x5_private *priv =usb_get_serial_port_data (port);int ret;
@@ -442,7 +440,7 @@ static int spcp8x5_open(struct tty_struct *tty, struct usb_serial_port *port)/* Setup termios */ if (tty) -spcp8x5_set_termios (tty, port, &tmp_termios); +spcp8x5_set_termios (tty, port,NULL );spcp8x5_get_msr (serial->dev, &status, priv->type);
fs/ceph/locks.c +47 -26
112 lines not on this page · raw message
fs/ceph/mds_client.c +49 -41
125 lines not on this page · raw message
fs/ceph/super.h +7 -2
@@ -841,8 +841,13 @@ extern const struct export_operations ceph_export_ops;extern int ceph_lock (struct file *file,int cmd,struct file_lock *fl);extern int ceph_flock (struct file *file,int cmd,struct file_lock *fl);extern void ceph_count_locks (struct inode *inode,int *p_num,int *f_num); -extern int ceph_encode_locks (struct inode *i,struct ceph_pagelist *p, -int p_locks,int f_locks); +extern int ceph_encode_locks_to_buffer (struct inode *inode, +struct ceph_filelock *flocks, +int num_fcntl_locks, +int num_flock_locks); +extern int ceph_locks_to_pagelist (struct ceph_filelock *flocks, +struct ceph_pagelist *pagelist, +int num_fcntl_locks,int num_flock_locks);extern int lock_to_ceph_filelock (struct file_lock *fl,struct ceph_filelock *c);/* debugfs.c */
fs/proc/kmsg.c +5 -5
@@ -21,12 +21,12 @@ extern wait_queue_head_t log_wait;static int kmsg_open (struct inode * inode,struct file * file) { -return do_syslog (SYSLOG_ACTION_OPEN ,NULL ,0 ,SYSLOG_FROM_FILE ); +return do_syslog (SYSLOG_ACTION_OPEN ,NULL ,0 ,SYSLOG_FROM_PROC ); }static int kmsg_release (struct inode * inode,struct file * file) { - (void )do_syslog (SYSLOG_ACTION_CLOSE ,NULL ,0 ,SYSLOG_FROM_FILE ); + (void )do_syslog (SYSLOG_ACTION_CLOSE ,NULL ,0 ,SYSLOG_FROM_PROC );return 0 ; }
@@ -34,15 +34,15 @@ static ssize_t kmsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) {if ((file->f_flags &O_NONBLOCK ) && - !do_syslog (SYSLOG_ACTION_SIZE_UNREAD ,NULL ,0 ,SYSLOG_FROM_FILE )) + !do_syslog (SYSLOG_ACTION_SIZE_UNREAD ,NULL ,0 ,SYSLOG_FROM_PROC ))return -EAGAIN ; -return do_syslog (SYSLOG_ACTION_READ , buf, count,SYSLOG_FROM_FILE ); +return do_syslog (SYSLOG_ACTION_READ , buf, count,SYSLOG_FROM_PROC ); }static unsigned int kmsg_poll (struct file *file,poll_table *wait) {poll_wait (file, &log_wait, wait); -if (do_syslog (SYSLOG_ACTION_SIZE_UNREAD ,NULL ,0 ,SYSLOG_FROM_FILE )) +if (do_syslog (SYSLOG_ACTION_SIZE_UNREAD ,NULL ,0 ,SYSLOG_FROM_PROC ))return POLLIN |POLLRDNORM ;return 0 ; }
include/linux/ceph/auth.h +18 -0
@@ -52,6 +52,9 @@ struct ceph_auth_client_ops {*/ int (*create_authorizer)(struct ceph_auth_client *ac,int peer_type,struct ceph_auth_handshake *auth); +/* ensure that an existing authorizer is up to date */ +int (*update_authorizer)(struct ceph_auth_client *ac,int peer_type, +struct ceph_auth_handshake *auth);int (*verify_authorizer_reply)(struct ceph_auth_client *ac,struct ceph_authorizer *a,size_t len); void (*destroy_authorizer)(struct ceph_auth_client *ac,
@@ -75,6 +78,8 @@ struct ceph_auth_client {u64 global_id;/* our unique id in system */ const struct ceph_crypto_key *key;/* our secret key */ unsigned want_keys;/* which services we want */ + +struct mutex mutex; }; extern struct ceph_auth_client *ceph_auth_init(const char *name,
@@ -94,5 +99,18 @@ extern int ceph_build_auth(struct ceph_auth_client *ac, void *msg_buf, size_t msg_len);extern int ceph_auth_is_authenticated (struct ceph_auth_client *ac); +extern int ceph_auth_create_authorizer (struct ceph_auth_client *ac, +int peer_type, +struct ceph_auth_handshake *auth); +extern void ceph_auth_destroy_authorizer (struct ceph_auth_client *ac, +struct ceph_authorizer *a); +extern int ceph_auth_update_authorizer (struct ceph_auth_client *ac, +int peer_type, +struct ceph_auth_handshake *a); +extern int ceph_auth_verify_authorizer_reply (struct ceph_auth_client *ac, +struct ceph_authorizer *a, +size_t len); +extern void ceph_auth_invalidate_authorizer (struct ceph_auth_client *ac, +int peer_type);#endif
include/linux/cpu.h +4 -0
@@ -175,6 +175,8 @@ extern struct bus_type cpu_subsys;extern void get_online_cpus (void );extern void put_online_cpus (void ); +extern void cpu_hotplug_disable (void ); +extern void cpu_hotplug_enable (void );#define hotcpu_notifier (fn, pri) cpu_notifier(fn, pri)#define register_hotcpu_notifier (nb) register_cpu_notifier(nb)#define unregister_hotcpu_notifier (nb) unregister_cpu_notifier(nb)
@@ -198,6 +200,8 @@ static inline void cpu_hotplug_driver_unlock(void)#define get_online_cpus () do { } while (0)#define put_online_cpus () do { } while (0) +#define cpu_hotplug_disable () do { } while (0) +#define cpu_hotplug_enable () do { } while (0)#define hotcpu_notifier (fn, pri) do { (void)(fn); } while (0)/* These aren't inline functions due to a GCC bug. */ #define register_hotcpu_notifier (nb) ({ (void)(nb); 0; })
include/linux/swapops.h +3 -0
@@ -137,6 +137,7 @@ static inline void make_migration_entry_read(swp_entry_t *entry)extern void migration_entry_wait (struct mm_struct *mm,pmd_t *pmd,unsigned long address); +extern void migration_entry_wait_huge (struct mm_struct *mm,pte_t *pte);#else #define make_migration_entry (page, write) swp_entry(0, 0)
@@ -148,6 +149,8 @@ static inline int is_migration_entry(swp_entry_t swp)static inline void make_migration_entry_read (swp_entry_t *entryp) { }static inline void migration_entry_wait (struct mm_struct *mm,pmd_t *pmd,unsigned long address) { } +static inline void migration_entry_wait_huge (struct mm_struct *mm, +pte_t *pte) { }static inline int is_write_migration_entry (swp_entry_t entry) {return 0 ;
include/linux/syslog.h +2 -2
@@ -44,8 +44,8 @@/* Return size of the log buffer */ #define SYSLOG_ACTION_SIZE_BUFFER 10 -#define SYSLOG_FROM_CALL 0 -#define SYSLOG_FROM_FILE 1 +#define SYSLOG_FROM_READER 0 +#define SYSLOG_FROM_PROC 1int do_syslog (int type,char __user *buf,int count,bool from_file);
include/net/bluetooth/hci_core.h +1 -0
@@ -1065,6 +1065,7 @@ void hci_sock_dev_event(struct hci_dev *hdev, int event);int mgmt_control (struct sock *sk,struct msghdr *msg,size_t len);int mgmt_index_added (struct hci_dev *hdev);int mgmt_index_removed (struct hci_dev *hdev); +int mgmt_set_powered_failed (struct hci_dev *hdev,int err);int mgmt_powered (struct hci_dev *hdev,u8 powered);int mgmt_discoverable (struct hci_dev *hdev,u8 discoverable);int mgmt_connectable (struct hci_dev *hdev,u8 connectable);
include/net/bluetooth/mgmt.h +1 -0
@@ -42,6 +42,7 @@#define MGMT_STATUS_NOT_POWERED 0x0f#define MGMT_STATUS_CANCELLED 0x10#define MGMT_STATUS_INVALID_INDEX 0x11 +#define MGMT_STATUS_RFKILLED 0x12struct mgmt_hdr {__le16 opcode;
kernel/audit.c +1 -1
@@ -1107,7 +1107,7 @@ static inline void audit_get_stamp(struct audit_context *ctx,static void wait_for_auditd (unsigned long sleep_time) {DECLARE_WAITQUEUE (wait, current); -set_current_state (TASK_INTERRUPTIBLE ); +set_current_state (TASK_UNINTERRUPTIBLE );add_wait_queue (&audit_backlog_wait, &wait); if (audit_backlog_limit &&
kernel/cpu.c +23 -32
77 lines not on this page · raw message
kernel/printk.c +50 -41
115 lines not on this page · raw message
kernel/sys.c +26 -3
@@ -357,6 +357,29 @@ int unregister_reboot_notifier(struct notifier_block *nb) }EXPORT_SYMBOL (unregister_reboot_notifier); +/* Add backwards compatibility for stable trees. */ +#ifndef PF_NO_SETAFFINITY +#define PF_NO_SETAFFINITY PF_THREAD_BOUND +#endif + +static void migrate_to_reboot_cpu (void ) +{ +/* The boot cpu is always logical cpu 0 */ +int cpu =0 ; + +cpu_hotplug_disable (); + +/* Make certain the cpu I'm about to reboot on is online */ +if (!cpu_online (cpu)) + cpu =cpumask_first (cpu_online_mask); + +/* Prevent races with other tasks migrating this task */ + current->flags |=PF_NO_SETAFFINITY ; + +/* Make certain I only run on the appropriate processor */ +set_cpus_allowed_ptr (current,cpumask_of (cpu)); +} +/** * kernel_restart - reboot the system * @cmd: pointer to buffer containing command to execute for restart
@@ -368,7 +391,7 @@ EXPORT_SYMBOL(unregister_reboot_notifier);void kernel_restart (char *cmd) {kernel_restart_prepare (cmd); -disable_nonboot_cpus (); +migrate_to_reboot_cpu ();syscore_shutdown ();if (!cmd)printk (KERN_EMERG "Restarting system.\n" );
@@ -395,7 +418,7 @@ static void kernel_shutdown_prepare(enum system_states state)void kernel_halt (void ) {kernel_shutdown_prepare (SYSTEM_HALT ); -disable_nonboot_cpus (); +migrate_to_reboot_cpu ();syscore_shutdown ();printk (KERN_EMERG "System halted.\n" );kmsg_dump (KMSG_DUMP_HALT );
@@ -414,7 +437,7 @@ void kernel_power_off(void)kernel_shutdown_prepare (SYSTEM_POWER_OFF );if (pm_power_off_prepare)pm_power_off_prepare (); -disable_nonboot_cpus (); +migrate_to_reboot_cpu ();syscore_shutdown ();printk (KERN_EMERG "Power down.\n" );kmsg_dump (KMSG_DUMP_POWEROFF );
mm/hugetlb.c +1 -1
@@ -2823,7 +2823,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,if (ptep) { entry =huge_ptep_get (ptep);if (unlikely (is_hugetlb_entry_migration (entry))) { -migration_entry_wait (mm, (pmd_t *)ptep, address); +migration_entry_wait_huge (mm, ptep);return 0 ; }else if (unlikely (is_hugetlb_entry_hwpoisoned (entry))) return VM_FAULT_HWPOISON_LARGE |
mm/memcontrol.c +0 -2
@@ -3033,8 +3033,6 @@ int memcg_update_cache_size(struct kmem_cache *s, int num_groups)return -ENOMEM ; } -INIT_WORK (&s->memcg_params->destroy, - kmem_cache_destroy_work_func); s->memcg_params->is_root_cache = true;/*
mm/migrate.c +18 -5
@@ -200,15 +200,14 @@ static void remove_migration_ptes(struct page *old, struct page *new)* get to the page and wait until migration is finished. * When we return from this function the fault will be retried. */ -void migration_entry_wait (struct mm_struct *mm,pmd_t *pmd, -unsigned long address) +static void __migration_entry_wait (struct mm_struct *mm,pte_t *ptep, +spinlock_t *ptl) { -pte_t *ptep, pte; -spinlock_t *ptl; +pte_t pte;swp_entry_t entry;struct page *page; - ptep =pte_offset_map_lock (mm, pmd, address, &ptl); +spin_lock (ptl); pte = *ptep;if (!is_swap_pte (pte)) goto out;
@@ -236,6 +235,20 @@ out:pte_unmap_unlock (ptep, ptl); } +void migration_entry_wait (struct mm_struct *mm,pmd_t *pmd, +unsigned long address) +{ +spinlock_t *ptl =pte_lockptr (mm, pmd); +pte_t *ptep =pte_offset_map (pmd, address); +__migration_entry_wait (mm, ptep, ptl); +} + +void migration_entry_wait_huge (struct mm_struct *mm,pte_t *pte) +{ +spinlock_t *ptl = &(mm)->page_table_lock; +__migration_entry_wait (mm, pte, ptl); +} +#ifdef CONFIG_BLOCK /* Returns true if all buffers are successfully locked */ static bool buffer_migrate_lock_buffers(struct buffer_head *head,
mm/page_alloc.c +4 -2
@@ -1626,6 +1626,7 @@ static bool __zone_watermark_ok(struct zone *z, int order, unsigned long mark,long min = mark;long lowmem_reserve = z->lowmem_reserve[classzone_idx];int o; +long free_cma =0 ; free_pages -= (1 << order) -1 ;if (alloc_flags &ALLOC_HIGH )
@@ -1635,9 +1636,10 @@ static bool __zone_watermark_ok(struct zone *z, int order, unsigned long mark,#ifdef CONFIG_CMA /* If allocation can't use CMA areas don't use free CMA pages */ if (!(alloc_flags &ALLOC_CMA )) - free_pages -=zone_page_state (z,NR_FREE_CMA_PAGES ); + free_cma =zone_page_state (z,NR_FREE_CMA_PAGES );#endif -if (free_pages <= min + lowmem_reserve) + +if (free_pages - free_cma <= min + lowmem_reserve)return false;for (o =0 ; o < order; o++) {/* At the next order, this order's pages become unavailable */
mm/swap_state.c +17 -1
@@ -336,8 +336,24 @@ struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,* Swap entry may have been freed since our caller observed it. */ err =swapcache_prepare (entry); -if (err == -EEXIST ) {/* seems racy */ +if (err == -EEXIST ) {radix_tree_preload_end (); +/* +* We might race against get_swap_page() and stumble +* across a SWAP_HAS_CACHE swap_map entry whose page +* has not been brought into the swapcache yet, while +* the other end is scheduled away waiting on discard +* I/O completion at scan_swap_map(). +* +* In order to avoid turning this transitory state +* into a permanent loop around this -EEXIST case +* if !CONFIG_PREEMPT and the I/O completion happens +* to be waiting on the CPU waitqueue where we are now +* busy looping, we just conditionally invoke the +* scheduler here, if there are some more important +* tasks to run. +*/ +cond_resched ();continue ; }if (err) {/* swp entry is obsolete ? */
net/bluetooth/hci_core.c +5 -1
@@ -1139,11 +1139,15 @@ static const struct rfkill_ops hci_rfkill_ops = {static void hci_power_on (struct work_struct *work) { struct hci_dev *hdev = container_of(work, struct hci_dev, power_on); +int err;BT_DBG ("%s" , hdev->name); -if (hci_dev_open (hdev->id) <0 ) + err =hci_dev_open (hdev->id); +if (err <0 ) { +mgmt_set_powered_failed (hdev, err);return ; + }if (test_bit (HCI_AUTO_OFF , &hdev->dev_flags)) queue_delayed_work(hdev->req_workqueue, &hdev->power_off,
net/bluetooth/l2cap_core.c +52 -18
202 lines not on this page · raw message
net/bluetooth/mgmt.c +21 -0
@@ -3124,6 +3124,27 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered)return err; } +int mgmt_set_powered_failed (struct hci_dev *hdev,int err) +{ +struct pending_cmd *cmd; +u8 status; + + cmd =mgmt_pending_find (MGMT_OP_SET_POWERED , hdev); +if (!cmd) +return -ENOENT ; + +if (err == -ERFKILL ) + status =MGMT_STATUS_RFKILLED ; +else + status =MGMT_STATUS_FAILED ; + + err =cmd_status (cmd->sk, hdev->id,MGMT_OP_SET_POWERED , status); + +mgmt_pending_remove (cmd); + +return err; +} +int mgmt_discoverable (struct hci_dev *hdev,u8 discoverable) {struct cmd_lookup match = {NULL , hdev };
net/ceph/auth.c +99 -18
186 lines not on this page · raw message
net/ceph/auth_x.c +23 -1
@@ -298,6 +298,7 @@ static int ceph_x_build_authorizer(struct ceph_auth_client *ac,return -ENOMEM ; } au->service = th->service; + au->secret_id = th->secret_id; msg_a = au->buf->vec.iov_base; msg_a->struct_v =1 ;
@@ -555,6 +556,26 @@ static int ceph_x_create_authorizer(return 0 ; } +static int ceph_x_update_authorizer ( +struct ceph_auth_client *ac,int peer_type, +struct ceph_auth_handshake *auth) +{ +struct ceph_x_authorizer *au; +struct ceph_x_ticket_handler *th; + + th =get_ticket_handler (ac, peer_type); +if (IS_ERR (th)) +return PTR_ERR (th); + + au = (struct ceph_x_authorizer *)auth->authorizer; +if (au->secret_id < th->secret_id) { +dout ("ceph_x_update_authorizer service %u secret %llu < %llu\n" , + au->service, au->secret_id, th->secret_id); +return ceph_x_build_authorizer (ac, th, au); + } +return 0 ; +} +static int ceph_x_verify_authorizer_reply (struct ceph_auth_client *ac,struct ceph_authorizer *a,size_t len) {
@@ -630,7 +651,7 @@ static void ceph_x_invalidate_authorizer(struct ceph_auth_client *ac, th =get_ticket_handler (ac, peer_type);if (!IS_ERR (th)) -remove_ticket_handler (ac, th); +memset (&th->validity,0 ,sizeof (th->validity)); }
@@ -641,6 +662,7 @@ static const struct ceph_auth_client_ops ceph_x_ops = { .build_request = ceph_x_build_request, .handle_reply = ceph_x_handle_reply, .create_authorizer = ceph_x_create_authorizer, + .update_authorizer = ceph_x_update_authorizer, .verify_authorizer_reply = ceph_x_verify_authorizer_reply, .destroy_authorizer = ceph_x_destroy_authorizer, .invalidate_authorizer = ceph_x_invalidate_authorizer,
net/ceph/auth_x.h +1 -0
@@ -29,6 +29,7 @@ struct ceph_x_authorizer {struct ceph_buffer *buf;unsigned int service;u64 nonce; +u64 secret_id;char reply_buf[128 ];/* big enough for encrypted blob */ };
net/ceph/messenger.c +1 -2
@@ -1597,7 +1597,6 @@ static int process_connect(struct ceph_connection *con) con->error_msg ="connect authorization failure" ;return -1 ; } - con->auth_retry =1 ;con_out_kvec_reset (con); ret =prepare_write_connect (con);if (ret <0 )
@@ -1682,7 +1681,7 @@ static int process_connect(struct ceph_connection *con)WARN_ON (con->state !=CON_STATE_NEGOTIATING ); con->state =CON_STATE_OPEN ; - + con->auth_retry =0 ;/* we authenticated; clear flag */ con->peer_global_seq =le32_to_cpu (con->in_reply.global_seq); con->connect_seq++; con->peer_features = server_feat;
net/ceph/mon_client.c +3 -4
@@ -737,7 +737,7 @@ static void delayed_work(struct work_struct *work)__validate_auth (monc); -if (monc->auth->ops->is_authenticated (monc->auth)) +if (ceph_auth_is_authenticated (monc->auth))__send_subscribe (monc); }__schedule_delayed (monc);
@@ -892,8 +892,7 @@ static void handle_auth_reply(struct ceph_mon_client *monc,mutex_lock (&monc->mutex); had_debugfs_info =have_debugfs_info (monc); -if (monc->auth->ops) - was_auth = monc->auth->ops->is_authenticated (monc->auth); + was_auth =ceph_auth_is_authenticated (monc->auth); monc->pending_auth =0 ; ret = ceph_handle_auth_reply(monc->auth, msg->front.iov_base, msg->front.iov_len,
@@ -904,7 +903,7 @@ static void handle_auth_reply(struct ceph_mon_client *monc,wake_up_all (&monc->client->auth_wq); }else if (ret >0 ) {__send_prepared_auth_request (monc, ret); - }else if (!was_auth && monc->auth->ops->is_authenticated (monc->auth)) { + }else if (!was_auth &&ceph_auth_is_authenticated (monc->auth)) {dout ("authenticated, starting session\n" ); monc->client->msgr.inst.name.type =CEPH_ENTITY_TYPE_CLIENT ;
net/ceph/osd_client.c +13 -16
@@ -654,8 +654,7 @@ static void put_osd(struct ceph_osd *osd)if (atomic_dec_and_test (&osd->o_ref) && osd->o_auth.authorizer) {struct ceph_auth_client *ac = osd->o_osdc->client->monc.auth; -if (ac->ops && ac->ops->destroy_authorizer) - ac->ops->destroy_authorizer (ac, osd->o_auth.authorizer); +ceph_auth_destroy_authorizer (ac, osd->o_auth.authorizer);kfree (osd); } }
@@ -1399,13 +1398,13 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend)__register_request (osdc, req);__unregister_linger_request (osdc, req); } +reset_changed_osds (osdc);mutex_unlock (&osdc->request_mutex);if (needmap) {dout ("%d requests for down osds, need new map\n" , needmap);ceph_monc_request_next_osdmap (&osdc->client->monc); } -reset_changed_osds (osdc); }
@@ -2168,13 +2167,17 @@ static struct ceph_auth_handshake *get_authorizer(struct ceph_connection *con,struct ceph_auth_handshake *auth = &o->o_auth;if (force_new && auth->authorizer) { -if (ac->ops && ac->ops->destroy_authorizer) - ac->ops->destroy_authorizer (ac, auth->authorizer); +ceph_auth_destroy_authorizer (ac, auth->authorizer); auth->authorizer =NULL ; } -if (!auth->authorizer && ac->ops && ac->ops->create_authorizer) { -int ret = ac->ops->create_authorizer (ac,CEPH_ENTITY_TYPE_OSD , - auth); +if (!auth->authorizer) { +int ret =ceph_auth_create_authorizer (ac,CEPH_ENTITY_TYPE_OSD , + auth); +if (ret) +return ERR_PTR (ret); + }else { +int ret =ceph_auth_update_authorizer (ac,CEPH_ENTITY_TYPE_OSD , + auth);if (ret)return ERR_PTR (ret); }
@@ -2190,11 +2193,7 @@ static int verify_authorizer_reply(struct ceph_connection *con, int len)struct ceph_osd_client *osdc = o->o_osdc;struct ceph_auth_client *ac = osdc->client->monc.auth; -/* -* XXX If ac->ops or ac->ops->verify_authorizer_reply is null, -* XXX which do we do: succeed or fail? -*/ -return ac->ops->verify_authorizer_reply (ac, o->o_auth.authorizer, len); +return ceph_auth_verify_authorizer_reply (ac, o->o_auth.authorizer, len); }static int invalidate_authorizer (struct ceph_connection *con)
@@ -2203,9 +2202,7 @@ static int invalidate_authorizer(struct ceph_connection *con)struct ceph_osd_client *osdc = o->o_osdc;struct ceph_auth_client *ac = osdc->client->monc.auth; -if (ac->ops && ac->ops->invalidate_authorizer) - ac->ops->invalidate_authorizer (ac,CEPH_ENTITY_TYPE_OSD ); - +ceph_auth_invalidate_authorizer (ac,CEPH_ENTITY_TYPE_OSD );return ceph_monc_validate_auth (&osdc->client->monc); }