1. 31 3月, 2013 1 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 13d2080d
      Linus Torvalds 提交于
      Pull SCSI target fixes from Nicholas Bellinger:
       "This includes the bug-fix for a >= v3.8-rc1 regression specific to
        iscsi-target persistent reservation conflict handling (CC'ed to
        stable), and a tcm_vhost patch to drop VIRTIO_RING_F_EVENT_IDX usage
        so that in-flight qemu vhost-scsi-pci device code can detect the
        proper vhost feature bits.
      
        Also, there are two more tcm_vhost patches still being discussed by
        MST and Asias for v3.9 that will be required for the in-flight qemu
        vhost-scsi-pci device patch to function properly, and that should
        (hopefully) be the last target fixes for this round."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        target: Fix RESERVATION_CONFLICT status regression for iscsi-target special case
        tcm_vhost: Avoid VIRTIO_RING_F_EVENT_IDX feature bit
      13d2080d
  2. 30 3月, 2013 6 次提交
    • R
      PNP: List Rafael Wysocki as a maintainer · 46a1f21a
      Rafael J. Wysocki 提交于
      The Adam Belay's e-mail address in MAINTAINERS under PNP SUPPORT
      is not valid any more and I started to maintain that code in the
      meantime as a matter of fact, so list myself as a maintainer of it
      along with Bjorn and remove the Adam's entry from it.
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      46a1f21a
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · b92eded4
      Linus Torvalds 提交于
      Pull ceph fix from Sage Weil:
       "This fixes a regression introduced during the last merge window when
        mapping non-existent images."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        rbd: don't zero-fill non-image object requests
      b92eded4
    • A
      rbd: don't zero-fill non-image object requests · 6e2a4505
      Alex Elder 提交于
      A result of ENOENT from a read request for an object that's part of
      an rbd image indicates that there is a hole in that portion of the
      image.  Similarly, a short read for such an object indicates that
      the remainder of the read should be interpreted a full read with
      zeros filling out the end of the request.
      
      This behavior is not correct for objects that are not backing rbd
      image data.  Currently rbd_img_obj_request_callback() assumes it
      should be done for all objects.
      
      Change rbd_img_obj_request_callback() so it only does this zeroing
      for image objects.  Encapsulate that special handling in its own
      function.  Add an assertion that the image object request is a bio
      request, since we assume that (and we currently don't support any
      other types).
      
      This resolves a problem identified here:
          http://tracker.ceph.com/issues/4559
      
      The regression was introduced by bf0d5f50.
      Reported-by: NDan van der Ster <dan@vanderster.com>
      Signed-off-by: NAlex Elder <elder@inktank.com>
      Reviewed-off-by: NSage Weil <sage@inktank.com>
      6e2a4505
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 3615db41
      Linus Torvalds 提交于
      Pull btrfs fixes from Chris Mason:
       "We've had a busy two weeks of bug fixing.  The biggest patches in here
        are some long standing early-enospc problems (Josef) and a very old
        race where compression and mmap combine forces to lose writes (me).
        I'm fairly sure the mmap bug goes all the way back to the introduction
        of the compression code, which is proof that fsx doesn't trigger every
        possible mmap corner after all.
      
        I'm sure you'll notice one of these is from this morning, it's a small
        and isolated use-after-free fix in our scrub error reporting.  I
        double checked it here."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: don't drop path when printing out tree errors in scrub
        Btrfs: fix wrong return value of btrfs_lookup_csum()
        Btrfs: fix wrong reservation of csums
        Btrfs: fix double free in the btrfs_qgroup_account_ref()
        Btrfs: limit the global reserve to 512mb
        Btrfs: hold the ordered operations mutex when waiting on ordered extents
        Btrfs: fix space accounting for unlink and rename
        Btrfs: fix space leak when we fail to reserve metadata space
        Btrfs: fix EIO from btrfs send in is_extent_unchanged for punched holes
        Btrfs: fix race between mmap writes and compression
        Btrfs: fix memory leak in btrfs_create_tree()
        Btrfs: fix locking on ROOT_REPLACE operations in tree mod log
        Btrfs: fix missing qgroup reservation before fallocating
        Btrfs: handle a bogus chunk tree nicely
        Btrfs: update to use fs_state bit
      3615db41
    • L
      ia64 idle: delete stale (*idle)() function pointer · ed176886
      Len Brown 提交于
      Commit 3e7fc708 ("ia64 idle: delete pm_idle") in 3.9-rc1 didn't
      finish the job, leaving an un-initialized reference to (*idle)().
      
      [ Haven't seen a crash from this - but seems like we are just being
        lucky that "idle" is zero so it does get initialized before we jump to
        randomland  - Len ]
      Reported-by: NLars-Peter Clausen <lars@metafoo.de>
      Signed-off-by: NLen Brown <len.brown@intel.com>
      Signed-off-by: NTony Luck <tony.luck@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ed176886
    • L
      Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · 67e17c11
      Linus Torvalds 提交于
      Pull arc architecture fixes from Vineet Gupta:
       "This includes fix for a serious bug in DMA mapping API, make
        allyesconfig wreckage, removal of bogus email-list placeholder in
        MAINTAINERS, a typo in ptrace helper code and last remaining changes
        for syscall ABI v3 which we are finally starting to transition-to
        internally.
      
        The request is late than I intended to - but I was held up with
        debugging a timer link list corruption, for which a proposed fix to
        generic timer code was sent out to lkml/tglx earlier today."
      
      * 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: Fix the typo in event identifier flags used by ptrace
        arc: fix dma_address assignment during dma_map_sg()
        ARC: Remove SET_PERSONALITY (tracks cross-arch change)
        ARC: ABIv3: fork/vfork wrappers not needed in "no-legacy-syscall" ABI
        ARC: ABIv3: Print the correct ABI ver
        ARC: make allyesconfig build breakages
        ARC: MAINTAINERS update for ARC
      67e17c11
  3. 29 3月, 2013 14 次提交
  4. 28 3月, 2013 19 次提交