1. 06 11月, 2011 19 次提交
  2. 05 11月, 2011 21 次提交
    • D
      VFS: fix statfs() automounter semantics regression · 5c8a0fbb
      Dan McGee 提交于
      No one in their right mind would expect statfs() to not work on a
      automounter managed mount point. Fix it.
      
      [ I'm not sure about the "no one in their right mind" part.  It's not
        mounted, and you didn't ask for it to be mounted.  But nobody will
        really care, and this probably makes it match previous semantics, so..
            - Linus ]
      
      This mirrors the fix made to the quota code in 815d405c.
      Signed-off-by: NDan McGee <dpmcgee@gmail.com>
      Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
      Cc: Alexander Viro <viro@zeniv.linux.org.uk>
      Cc: stable@kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5c8a0fbb
    • L
      Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma · fba95699
      Linus Torvalds 提交于
      * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (63 commits)
        dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle
        dmaengine/ep93xx_dma: add module.h include
        pch_dma: Reduce wasting memory
        pch_dma: Fix suspend issue
        dma/timberdale: free_irq() on an error path
        dma: shdma: transfer based runtime PM
        dmaengine: shdma: protect against the IRQ handler
        dmaengine i.MX DMA/SDMA: add missing include of linux/module.h
        dmaengine: delete redundant chan_id and chancnt initialization in dma drivers
        dmaengine/amba-pl08x: Check txd->llis_va before freeing dma_pool
        dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers
        serial: sh-sci: don't filter on DMA device, use only channel ID
        ARM: SAMSUNG: Remove Samsung specific enum type for dma direction
        ASoC: Samsung: Update DMA interface
        spi/s3c64xx: Merge dma control code
        spi/s3c64xx: Add support DMA engine API
        ARM: SAMSUNG: Remove S3C-PL330-DMA driver
        ARM: S5P64X0: Use generic DMA PL330 driver
        ARM: S5PC100: Use generic DMA PL330 driver
        ARM: S5PV210: Use generic DMA PL330 driver
        ...
      
      Fix up fairly trivial conflicts in
       - arch/arm/mach-exynos4/{Kconfig,clock.c}
       - arch/arm/mach-s5p64x0/dma.c
      fba95699
    • L
      Merge branch 'for-3.2/drivers' of git://git.kernel.dk/linux-block · 3d0a8d10
      Linus Torvalds 提交于
      * 'for-3.2/drivers' of git://git.kernel.dk/linux-block: (30 commits)
        virtio-blk: use ida to allocate disk index
        hpsa: add small delay when using PCI Power Management to reset for kump
        cciss: add small delay when using PCI Power Management to reset for kump
        xen/blkback: Fix two races in the handling of barrier requests.
        xen/blkback: Check for proper operation.
        xen/blkback: Fix the inhibition to map pages when discarding sector ranges.
        xen/blkback: Report VBD_WSECT (wr_sect) properly.
        xen/blkback: Support 'feature-barrier' aka old-style BARRIER requests.
        xen-blkfront: plug device number leak in xlblk_init() error path
        xen-blkfront: If no barrier or flush is supported, use invalid operation.
        xen-blkback: use kzalloc() in favor of kmalloc()+memset()
        xen-blkback: fixed indentation and comments
        xen-blkfront: fix a deadlock while handling discard response
        xen-blkfront: Handle discard requests.
        xen-blkback: Implement discard requests ('feature-discard')
        xen-blkfront: add BLKIF_OP_DISCARD and discard request struct
        drivers/block/loop.c: remove unnecessary bdev argument from loop_clr_fd()
        drivers/block/loop.c: emit uevent on auto release
        drivers/block/cpqarray.c: use pci_dev->revision
        loop: always allow userspace partitions and optionally support automatic scanning
        ...
      
      Fic up trivial header file includsion conflict in drivers/block/loop.c
      3d0a8d10
    • L
      Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block · b4fdcb02
      Linus Torvalds 提交于
      * 'for-3.2/core' of git://git.kernel.dk/linux-block: (29 commits)
        block: don't call blk_drain_queue() if elevator is not up
        blk-throttle: use queue_is_locked() instead of lockdep_is_held()
        blk-throttle: Take blkcg->lock while traversing blkcg->policy_list
        blk-throttle: Free up policy node associated with deleted rule
        block: warn if tag is greater than real_max_depth.
        block: make gendisk hold a reference to its queue
        blk-flush: move the queue kick into
        blk-flush: fix invalid BUG_ON in blk_insert_flush
        block: Remove the control of complete cpu from bio.
        block: fix a typo in the blk-cgroup.h file
        block: initialize the bounce pool if high memory may be added later
        block: fix request_queue lifetime handling by making blk_queue_cleanup() properly shutdown
        block: drop @tsk from attempt_plug_merge() and explain sync rules
        block: make get_request[_wait]() fail if queue is dead
        block: reorganize throtl_get_tg() and blk_throtl_bio()
        block: reorganize queue draining
        block: drop unnecessary blk_get/put_queue() in scsi_cmd_ioctl() and blk_get_tg()
        block: pass around REQ_* flags instead of broken down booleans during request alloc/free
        block: move blk_throtl prototypes to block/blk.h
        block: fix genhd refcounting in blkio_policy_parse_and_set()
        ...
      
      Fix up trivial conflicts due to "mddev_t" -> "struct mddev" conversion
      and making the request functions be of type "void" instead of "int" in
       - drivers/md/{faulty.c,linear.c,md.c,md.h,multipath.c,raid0.c,raid1.c,raid10.c,raid5.c}
       - drivers/staging/zram/zram_drv.c
      b4fdcb02
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next · 044595d4
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next:
        Squashfs: Add an option to set dev block size to 4K
      044595d4
    • T
      PM / Freezer: Revert 27920651 "PM / Freezer: Make fake_signal_wake_up() wake... · d6cc7685
      Tejun Heo 提交于
      PM / Freezer: Revert 27920651 "PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too"
      
      Commit 27920651 "PM / Freezer: Make fake_signal_wake_up() wake
      TASK_KILLABLE tasks too" updated fake_signal_wake_up() used by freezer
      to wake up KILLABLE tasks.  Sending unsolicited wakeups to tasks in
      killable sleep is dangerous as there are code paths which depend on
      tasks not waking up spuriously from KILLABLE sleep.
      
      For example. sys_read() or page can sleep in TASK_KILLABLE assuming
      that wait/down/whatever _killable can only fail if we can not return
      to the usermode.  TASK_TRACED is another obvious example.
      
      The previous patch updated wait_event_freezekillable() such that it
      doesn't depend on the spurious wakeup.  This patch reverts the
      offending commit.
      
      Note that the spurious KILLABLE wakeup had other implicit effects in
      KILLABLE sleeps in nfs and cifs and those will need further updates to
      regain freezekillable behavior.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      d6cc7685
    • O
      PM / Freezer: Reimplement wait_event_freezekillable using freezer_do_not_count/freezer_count · 6f35c4ab
      Oleg Nesterov 提交于
      Commit 27920651 "PM / Freezer: Make fake_signal_wake_up() wake
      TASK_KILLABLE tasks too" updated fake_signal_wake_up() used by freezer
      to wake up KILLABLE tasks.  Sending unsolicited wakeups to tasks in
      killable sleep is dangerous as there are code paths which depend on
      tasks not waking up spuriously from KILLABLE sleep.
      
      For example. sys_read() or page can sleep in TASK_KILLABLE assuming
      that wait/down/whatever _killable can only fail if we can not return
      to the usermode.  TASK_TRACED is another obvious example.
      
      The offending commit was to resolve freezer hang during system PM
      operations caused by KILLABLE sleeps in network filesystems.
      wait_event_freezekillable(), which depends on the spurious KILLABLE
      wakeup, was added by f06ac72e "cifs, freezer: add
      wait_event_freezekillable and have cifs use it" to be used to
      implement killable & freezable sleeps in network filesystems.
      
      To prepare for reverting of 27920651, this patch reimplements
      wait_event_freezekillable() using freezer_do_not_count/freezer_count()
      so that it doesn't depend on the spurious KILLABLE wakeup.  This isn't
      very nice but should do for now.
      
      [tj: Refreshed patch to apply to linus/master and updated commit
          description on Rafael's request.]
      Signed-off-by: NOleg Nesterov <oleg@redhat.com>
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      6f35c4ab
    • A
      USB: Update last_busy time after autosuspend fails · b2c0a863
      Alan Stern 提交于
      Originally, the runtime PM core would send an idle notification
      whenever a suspend attempt failed.  The idle callback routine could
      then schedule a delayed suspend for some time later.
      
      However this behavior was changed by commit
      f71648d7 (PM / Runtime: Remove idle
      notification after failing suspend).  No notifications were sent, and
      there was no clear mechanism to retry failed suspends.
      
      This caused problems for the usbhid driver, because it fails
      autosuspend attempts as long as a key is being held down.  A companion
      patch changes the PM core's behavior, but we also need to change the
      USB core.  In particular, this patch (as1493) updates the device's
      last_busy time when an autosuspend fails, so that the PM core will
      retry the autosuspend in the future when the delay time expires
      again.
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Tested-by: NHenrik Rydberg <rydberg@euromail.se>
      Cc: <stable@kernel.org>
      Acked-by: NGreg Kroah-Hartman <gregkh@suse.de>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      b2c0a863
    • A
      PM / Runtime: Automatically retry failed autosuspends · 886486b7
      Alan Stern 提交于
      Originally, the runtime PM core would send an idle notification
      whenever a suspend attempt failed.  The idle callback routine could
      then schedule a delayed suspend for some time later.
      
      However this behavior was changed by commit
      f71648d7 (PM / Runtime: Remove idle
      notification after failing suspend).  No notifications were sent, and
      there was no clear mechanism to retry failed suspends.
      
      This caused problems for the usbhid driver, because it fails
      autosuspend attempts as long as a key is being held down.  Therefore
      this patch (as1492) adds a mechanism for retrying failed
      autosuspends.  If the callback routine updates the last_busy field so
      that the next autosuspend expiration time is in the future, the
      autosuspend will automatically be rescheduled.
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Tested-by: NHenrik Rydberg <rydberg@euromail.se>
      Cc: <stable@kernel.org>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      886486b7
    • G
      PM / QoS: Remove redundant check · 6513fd69
      Guennadi Liakhovetski 提交于
      Remove an "if" check, that repeats an equivalent one 6 lines above.
      Signed-off-by: NGuennadi Liakhovetski <g.liakhovetski@gmx.de>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      6513fd69
    • T
      PM / OPP: Fix build when CONFIG_PM_OPP is not set · a96d69d1
      Tony Lindgren 提交于
      Commit 03ca370f (PM / OPP: Add
      OPP availability change notifier) does not compile if CONFIG_PM_OPP
      is not set:
      
      arch/arm/plat-omap/omap-pm-noop.o: In function `opp_get_notifier':
      include/linux/opp.h:103: multiple definition of `opp_get_notifier'
      include/linux/opp.h:103: first defined here
      
      Also fix incorrect comment.
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      a96d69d1
    • V
      PM / Runtime: Fix runtime accounting calculation error · def0c0a3
      venu byravarasu 提交于
      With delta type being int, its value is made zero
      for all values of now > 0x80000000.
      Hence fixing it.
      Signed-off-by: Nvenu byravarasu <vbyravarasu@nvidia.com>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      def0c0a3
    • S
      PM / Sleep: Update freezer documentation · e9db50b8
      Srivatsa S. Bhat 提交于
      This patch:
       * Substitutes some obsolete references to kernel/power/process.c by
         kernel/freezer.c.
       * Mentions kernel/freezer.c as being part of the "freezer" code along
         with the rest of the files.
       * Fixes a trivial typo.
      Signed-off-by: NSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      e9db50b8
    • S
      PM / Sleep: Remove unused symbol 'suspend_cpu_hotplug' · 4e71c954
      Srivatsa S. Bhat 提交于
      Remove the suspend_cpu_hotplug declaration, which doesn't correspond
      to an existing variable.
      
      [rjw: Added the changelog.]
      Signed-off-by: NSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      4e71c954
    • S
      PM / Sleep: Fix race between CPU hotplug and freezer · 79cfbdfa
      Srivatsa S. Bhat 提交于
      The CPU hotplug notifications sent out by the _cpu_up() and _cpu_down()
      functions depend on the value of the 'tasks_frozen' argument passed to them
      (which indicates whether tasks have been frozen or not).
      (Examples for such CPU hotplug notifications: CPU_ONLINE, CPU_ONLINE_FROZEN,
      CPU_DEAD, CPU_DEAD_FROZEN).
      
      Thus, it is essential that while the callbacks for those notifications are
      running, the state of the system with respect to the tasks being frozen or
      not remains unchanged, *throughout that duration*. Hence there is a need for
      synchronizing the CPU hotplug code with the freezer subsystem.
      
      Since the freezer is involved only in the Suspend/Hibernate call paths, this
      patch hooks the CPU hotplug code to the suspend/hibernate notifiers
      PM_[SUSPEND|HIBERNATE]_PREPARE and PM_POST_[SUSPEND|HIBERNATE] to prevent
      the race between CPU hotplug and freezer, thus ensuring that CPU hotplug
      notifications will always be run with the state of the system really being
      what the notifications indicate, _throughout_ their execution time.
      Signed-off-by: NSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      79cfbdfa
    • D
      ACPI / PM: Add Sony VPCEB17FX to nonvs blacklist · ddf6ce45
      Dave Jones 提交于
      Another entry for the nonvs blacklist, as noted by a user in
      https://bugzilla.redhat.com/show_bug.cgi?id=641789#c12Signed-off-by: NDave Jones <davej@redhat.com>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      ddf6ce45
    • L
      Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile · 15831714
      Linus Torvalds 提交于
      * 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile:
        arch/tile: factor out <arch/opcode.h> header
        arch/tile: add the <arch> headers to the set of installed kernel headers
        arch/tile: avoid exporting a symbol no longer used by gcc
        arch/tile: avoid ISO namespace pollution with <asm/sigcontext.h>
      15831714
    • L
      Merge branch 'nfs-for-3.2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 6736c047
      Linus Torvalds 提交于
      * 'nfs-for-3.2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (25 commits)
        nfs: set vs_hidden on nfs4_callback_version4 (try #2)
        pnfs-obj: Support for RAID5 read-4-write interface.
        pnfs-obj: move to ore 03: Remove old raid engine
        pnfs-obj: move to ore 02: move to ORE
        pnfs-obj: move to ore 01: ore_layout & ore_components
        pnfs-obj: Rename objlayout_io_state => objlayout_io_res
        pnfs-obj: Get rid of objlayout_{alloc,free}_io_state
        pnfs-obj: Return PNFS_NOT_ATTEMPTED in case of read/write_pagelist
        pnfs-obj: Remove redundant EOF from objlayout_io_state
        nfs: Remove unused variable from write.c
        nfs: Fix unused variable warning from file.c
        NFS: Remove no-op less-than-zero checks on unsigned variables.
        NFS: Clean up nfs4_xdr_dec_secinfo()
        NFS: Fix documenting comment for nfs_create_request()
        NFS4: fix cb_recallany decode error
        nfs4: serialize layoutcommit
        SUNRPC: remove rpcbind clients destruction on module cleanup
        SUNRPC: remove rpcbind clients creation during service registering
        NFSd: call svc rpcbind cleanup explicitly
        SUNRPC: cleanup service destruction
        ...
      6736c047
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 16dfd1fa
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/qib: Fix panic in RC error flushing logic
        IB/iser: DMA unmap TX bufs used for iSCSI/iSER headers
        IB/iser: Use separate buffers for the login request/response
        IB/mthca: Fix buddy->num_free allocation size
      16dfd1fa
    • W
      Documentation: drop as block elevator reference in switching-sched.txt · b3196681
      Wang Sheng-Hui 提交于
      Remove 'as' for as is no longer supported, and we can not use
      'elevator=as' any more.
      Signed-off-by: NWang Sheng-Hui <shhuiw@gmail.com>
      Signed-off-by: NRandy Dunlap <rdunlap@xenotime.net>
      Cc: Jens Axboe <axboe@kernel.dk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b3196681
    • B
      Documentation: fix leds-class.txt duplicated word · ee31892a
      Bryan Wu 提交于
      Fix a typo (duplicated word) in Documentation/leds/leds-class.txt
      Signed-off-by: NBryan Wu <bryan.wu@canonical.com>
      Acked-by: NRichard Purdie <rchard.purdie@linuxfoundation.org>
      Signed-off-by: NRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ee31892a