1. 20 2月, 2015 9 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 2b9fb532
      Linus Torvalds 提交于
      Pull btrfs updates from Chris Mason:
       "This pull is mostly cleanups and fixes:
      
         - The raid5/6 cleanups from Zhao Lei fixup some long standing warts
           in the code and add improvements on top of the scrubbing support
           from 3.19.
      
         - Josef has round one of our ENOSPC fixes coming from large btrfs
           clusters here at FB.
      
         - Dave Sterba continues a long series of cleanups (thanks Dave), and
           Filipe continues hammering on corner cases in fsync and others
      
        This all was held up a little trying to track down a use-after-free in
        btrfs raid5/6.  It's not clear yet if this is just made easier to
        trigger with this pull or if its a new bug from the raid5/6 cleanups.
        Dave Sterba is the only one to trigger it so far, but he has a
        consistent way to reproduce, so we'll get it nailed shortly"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (68 commits)
        Btrfs: don't remove extents and xattrs when logging new names
        Btrfs: fix fsync data loss after adding hard link to inode
        Btrfs: fix BUG_ON in btrfs_orphan_add() when delete unused block group
        Btrfs: account for large extents with enospc
        Btrfs: don't set and clear delalloc for O_DIRECT writes
        Btrfs: only adjust outstanding_extents when we do a short write
        btrfs: Fix out-of-space bug
        Btrfs: scrub, fix sleep in atomic context
        Btrfs: fix scheduler warning when syncing log
        Btrfs: Remove unnecessary placeholder in btrfs_err_code
        btrfs: cleanup init for list in free-space-cache
        btrfs: delete chunk allocation attemp when setting block group ro
        btrfs: clear bio reference after submit_one_bio()
        Btrfs: fix scrub race leading to use-after-free
        Btrfs: add missing cleanup on sysfs init failure
        Btrfs: fix race between transaction commit and empty block group removal
        btrfs: add more checks to btrfs_read_sys_array
        btrfs: cleanup, rename a few variables in btrfs_read_sys_array
        btrfs: add checks for sys_chunk_array sizes
        btrfs: more superblock checks, lower bounds on devices and sectorsize/nodesize
        ...
      2b9fb532
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 4533f6e2
      Linus Torvalds 提交于
      Pull Ceph changes from Sage Weil:
       "On the RBD side, there is a conversion to blk-mq from Christoph,
        several long-standing bug fixes from Ilya, and some cleanup from
        Rickard Strandqvist.
      
        On the CephFS side there is a long list of fixes from Zheng, including
        improved session handling, a few IO path fixes, some dcache management
        correctness fixes, and several blocking while !TASK_RUNNING fixes.
      
        The core code gets a few cleanups and Chaitanya has added support for
        TCP_NODELAY (which has been used on the server side for ages but we
        somehow missed on the kernel client).
      
        There is also an update to MAINTAINERS to fix up some email addresses
        and reflect that Ilya and Zheng are doing most of the maintenance for
        RBD and CephFS these days.  Do not be surprised to see a pull request
        come from one of them in the future if I am unavailable for some
        reason"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (27 commits)
        MAINTAINERS: update Ceph and RBD maintainers
        libceph: kfree() in put_osd() shouldn't depend on authorizer
        libceph: fix double __remove_osd() problem
        rbd: convert to blk-mq
        ceph: return error for traceless reply race
        ceph: fix dentry leaks
        ceph: re-send requests when MDS enters reconnecting stage
        ceph: show nocephx_require_signatures and notcp_nodelay options
        libceph: tcp_nodelay support
        rbd: do not treat standalone as flatten
        ceph: fix atomic_open snapdir
        ceph: properly mark empty directory as complete
        client: include kernel version in client metadata
        ceph: provide seperate {inode,file}_operations for snapdir
        ceph: fix request time stamp encoding
        ceph: fix reading inline data when i_size > PAGE_SIZE
        ceph: avoid block operation when !TASK_RUNNING (ceph_mdsc_close_sessions)
        ceph: avoid block operation when !TASK_RUNNING (ceph_get_caps)
        ceph: avoid block operation when !TASK_RUNNING (ceph_mdsc_sync)
        rbd: fix error paths in rbd_dev_refresh()
        ...
      4533f6e2
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 89d3fa45
      Linus Torvalds 提交于
      Pull thermal managament updates from Zhang Rui:
       "Specifics:
      
         - Abstract the code and introduce helper functions for all int340x
           thermal drivers.  From: Srinivas Pandruvada.
      
         - Reorganize the ACPI LPAT table support code so that it can be
           shared for both ACPI PMIC driver and int340x thermal driver.
      
         - Add support for Braswell in intel_soc_dts thermal driver.
      
         - a couple of small fixes/cleanups for step_wise governor and int340x
           thermal driver"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        Thermal/int340x_thermal: remove unused uuids.
        thermal: step_wise: spelling fixes
        thermal: int340x: fix sparse warning
        Thermal/int340x: LPAT conversion for temperature
        ACPI / PMIC: Use common LPAT table handling functions
        ACPI / LPAT: Common table processing functions
        thermal: Intel SoC DTS: Add Braswell support
        Thermal/int340x/int3402: Provide notification support
        Thermal/int340x/processor_thermal: Add thermal zone support
        Thermal/int340x/int3403: Use int340x thermal API
        Thermal/int340x/int3402: Use int340x thermal API
        Thermal/int340x: Add common thermal zone handler
      89d3fa45
    • L
      Merge tag 'edac_fixes_for_3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 477ea116
      Linus Torvalds 提交于
      Pull two EDAC fixes from Borislav Petkov:
      
       - A fix to sb_edac for proper detection on SNB machines
      
       - A fix to amd64_edac to not explode on Numascale machines with more
         than 16 memory controllers, from Daniel J Blueman.
      
      * tag 'edac_fixes_for_3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC, amd64_edac: Prevent OOPS with >16 memory controllers
        sb_edac: Fix detection on SNB machines
      477ea116
    • L
      Merge tag 'platform-drivers-x86-v3.20-1' of... · 6ed3e57f
      Linus Torvalds 提交于
      Merge tag 'platform-drivers-x86-v3.20-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull platform driver update from Darren Hart:
       "This includes a significant update to the toshiba_acpi driver,
        bringing it to feature parity with the Windows driver, followed by
        some needed cleanups.
      
        The other changes are mostly minor updates, quirks, sparse fixes, or
        cleanups.
      
        Details:
      
         - toshiba_acpi:
             Add support for missing features from the Windows driver, bump the
             sysfs version, and clean up the driver.
      
         - thinkpad_acpi:
             BIOS string versions, unhandled hkey events.
      
         - msamsung-laptop:
             Add native backlight quirk, enable better lid handling.
      
         - intel_scu_ipc:
             Read resources from PCI configuration
      
         - other:
             Fix sparse warnings, general cleanups"
      
      * tag 'platform-drivers-x86-v3.20-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (34 commits)
        toshiba_acpi: Cleanup GPL header
        toshiba_acpi: Cleanup comment blocks and capitalization
        toshiba_acpi: Make use of DEVICE_ATTR_{RO, RW} macros
        toshiba_acpi: Drop the toshiba_ prefix from sysfs function names
        toshiba_acpi: Move sysfs function and struct declarations further down
        Documentation/ABI: Add file describing the sysfs entries for toshiba_acpi
        toshiba_acpi: Clean file according to coding style
        toshiba_acpi: Bump version number to 0.21
        toshiba_acpi: Add support to enable/disable USB 3
        toshiba_acpi: Add support for Panel Power ON
        toshiba_acpi: Add support for Keyboard functions mode
        toshiba_acpi: Add fan entry to sysfs
        toshiba_acpi: Add version entry to sysfs
        thinkpad_acpi: support new BIOS version string pattern
        thinkpad_acpi: unhandled hkey event
        toshiba_acpi: Make toshiba_eco_mode_available more robust
        classmate-laptop: Fix sparse warning (0 as NULL)
        Sony-laptop: Fix sparse warning (make undeclared var static)
        thinkpad_acpi.c: Fix sparse warning (make undeclared var static)
        samsung-laptop.c: Prefer kstrtoint over single variable sscanf
        ...
      6ed3e57f
    • L
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · b11a2783
      Linus Torvalds 提交于
      Pull kconfig updates from Michal Marek:
       "Yann E Morin was supposed to take over kconfig maintainership, but
        this hasn't happened.  So I'm sending a few kconfig patches that I
        collected:
      
         - Fix for missing va_end in kconfig
         - merge_config.sh displays used if given too few arguments
         - s/boolean/bool/ in Kconfig files for consistency, with the plan to
           only support bool in the future"
      
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kconfig: use va_end to match corresponding va_start
        merge_config.sh: Display usage if given too few arguments
        kconfig: use bool instead of boolean for type definition attributes
      b11a2783
    • L
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 77343343
      Linus Torvalds 提交于
      Pull misc kbuild changes from Michal Marek:
       "Just a few non-critical kbuild changes:
      
         - builddeb adds the actual distribution name in the changelog
         - documentation fixes"
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kbuild: trivial - fix the help doc of CONFIG_CC_OPTIMIZE_FOR_SIZE
        kbuild: Update documentation of clean-files and clean-dirs
        builddeb: Try to determine distribution
        builddeb: Update year and git repository URL in debian/copyright
      77343343
    • S
      MAINTAINERS: update Ceph and RBD maintainers · 0f5417ce
      Sage Weil 提交于
      - add Ilya, drop Yehuda as an RBD maintainer
      - add Zheng as a Ceph maintainer
      - update Yehuda and Sage's emails
      Signed-off-by: NSage Weil <sage@redhat.com>
      0f5417ce
    • L
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 27a22ee4
      Linus Torvalds 提交于
      Pull kbuild updates from Michal Marek:
      
       - several cleanups in kbuild
      
       - serialize multiple *config targets so that 'make defconfig kvmconfig'
         works
      
       - The cc-ifversion macro got support for an else-branch
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kbuild,gcov: simplify kernel/gcov/Makefile more
        kbuild: allow cc-ifversion to have the argument for false condition
        kbuild,gcov: simplify kernel/gcov/Makefile
        kbuild,gcov: remove unnecessary workaround
        kbuild: do not add $(call ...) to invoke cc-version or cc-fullversion
        kbuild: fix cc-ifversion macro
        kbuild: drop $(version_h) from MRPROPER_FILES
        kbuild: use mixed-targets when two or more config targets are given
        kbuild: remove redundant line from bounds.h/asm-offsets.h
        kbuild: merge bounds.h and asm-offsets.h rules
        kbuild: Drop support for clean-rule
      27a22ee4
  2. 19 2月, 2015 31 次提交
    • I
      libceph: kfree() in put_osd() shouldn't depend on authorizer · b28ec2f3
      Ilya Dryomov 提交于
      a255651d ("ceph: ensure auth ops are defined before use") made
      kfree() in put_osd() conditional on the authorizer.  A mechanical
      mistake most likely - fix it.
      
      Cc: Alex Elder <elder@linaro.org>
      Signed-off-by: NIlya Dryomov <idryomov@gmail.com>
      Reviewed-by: NSage Weil <sage@redhat.com>
      Reviewed-by: NAlex Elder <elder@linaro.org>
      b28ec2f3
    • I
      libceph: fix double __remove_osd() problem · 7eb71e03
      Ilya Dryomov 提交于
      It turns out it's possible to get __remove_osd() called twice on the
      same OSD.  That doesn't sit well with rb_erase() - depending on the
      shape of the tree we can get a NULL dereference, a soft lockup or
      a random crash at some point in the future as we end up touching freed
      memory.  One scenario that I was able to reproduce is as follows:
      
                  <osd3 is idle, on the osd lru list>
      <con reset - osd3>
      con_fault_finish()
        osd_reset()
                                    <osdmap - osd3 down>
                                    ceph_osdc_handle_map()
                                      <takes map_sem>
                                      kick_requests()
                                        <takes request_mutex>
                                        reset_changed_osds()
                                          __reset_osd()
                                            __remove_osd()
                                        <releases request_mutex>
                                      <releases map_sem>
          <takes map_sem>
          <takes request_mutex>
          __kick_osd_requests()
            __reset_osd()
              __remove_osd() <-- !!!
      
      A case can be made that osd refcounting is imperfect and reworking it
      would be a proper resolution, but for now Sage and I decided to fix
      this by adding a safe guard around __remove_osd().
      
      Fixes: http://tracker.ceph.com/issues/8087
      
      Cc: Sage Weil <sage@redhat.com>
      Cc: stable@vger.kernel.org # 3.9+: 7c6e6fc5: libceph: assert both regular and lingering lists in __remove_osd()
      Cc: stable@vger.kernel.org # 3.9+: cc9f1f51: libceph: change from BUG to WARN for __remove_osd() asserts
      Cc: stable@vger.kernel.org # 3.9+
      Signed-off-by: NIlya Dryomov <idryomov@gmail.com>
      Reviewed-by: NSage Weil <sage@redhat.com>
      Reviewed-by: NAlex Elder <elder@linaro.org>
      7eb71e03
    • C
      rbd: convert to blk-mq · 7ad18afa
      Christoph Hellwig 提交于
      This converts the rbd driver to use the blk-mq infrastructure.  Except
      for switching to a per-request work item this is almost mechanical.
      
      This was tested by Alexandre DERUMIER in November, and found to give
      him 120000 iops, although the only comparism available was an old
      3.10 kernel which gave 80000iops.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Reviewed-by: NAlex Elder <elder@linaro.org>
      [idryomov@gmail.com: context, blk_mq_init_queue() EH]
      Signed-off-by: NIlya Dryomov <idryomov@gmail.com>
      7ad18afa
    • Y
      ceph: return error for traceless reply race · 4d41cef2
      Yan, Zheng 提交于
      When we receives traceless reply for request that created new inode,
      we re-send a lookup request to MDS get information of the newly created
      inode. (VFS expects FS' callback return an inode in create case)
      This breaks one request into two requests. Other client may modify or
      move to the new inode in the middle.
      
      When the race happens, ceph_handle_notrace_create() unconditionally
      links the dentry for 'create' operation to the inode returned by lookup.
      This may confuse VFS when the inode is a directory (VFS does not allow
      multiple linkages for directory inode).
      
      This patch makes ceph_handle_notrace_create() when it detect a race.
      This event should be rare and it happens only when we talk to old MDS.
      Recent MDS does not send traceless reply for request that creates new
      inode.
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      4d41cef2
    • Y
      ceph: fix dentry leaks · 5cba372c
      Yan, Zheng 提交于
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      5cba372c
    • Y
      ceph: re-send requests when MDS enters reconnecting stage · 3de22be6
      Yan, Zheng 提交于
      So that MDS can check if any request is already completed and process
      completed requests in clientreplay stage. When completed requests are
      processed in clientreplay stage, MDS can avoid sending traceless
      replies.
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      3de22be6
    • I
    • C
      libceph: tcp_nodelay support · ba988f87
      Chaitanya Huilgol 提交于
      TCP_NODELAY socket option set on connection sockets,
      disables Nagle’s algorithm and improves latency characteristics.
      tcp_nodelay(default)/notcp_nodelay option flags provided to
      enable/disable setting the socket option.
      Signed-off-by: NChaitanya Huilgol <chaitanya.huilgol@sandisk.com>
      [idryomov@redhat.com: NO_TCP_NODELAY -> TCP_NODELAY, minor adjustments]
      Signed-off-by: NIlya Dryomov <idryomov@redhat.com>
      ba988f87
    • I
      rbd: do not treat standalone as flatten · cf32bd9c
      Ilya Dryomov 提交于
      If the clone is resized down to 0, it becomes standalone.  If such
      resize is carried over while an image is mapped we would detect this
      and call rbd_dev_parent_put() which means "let go of all parent state,
      including the spec(s) of parent images(s)".  This leads to a mismatch
      between "rbd info" and sysfs parent fields, so a fix is in order.
      
          # rbd create --image-format 2 --size 1 foo
          # rbd snap create foo@snap
          # rbd snap protect foo@snap
          # rbd clone foo@snap bar
          # DEV=$(rbd map bar)
          # rbd resize --allow-shrink --size 0 bar
          # rbd resize --size 1 bar
          # rbd info bar | grep parent
                  parent: rbd/foo@snap
      
      Before:
      
          # cat /sys/bus/rbd/devices/0/parent
          (no parent image)
      
      After:
      
          # cat /sys/bus/rbd/devices/0/parent
          pool_id 0
          pool_name rbd
          image_id 10056b8b4567
          image_name foo
          snap_id 2
          snap_name snap
          overlap 0
      Signed-off-by: NIlya Dryomov <idryomov@redhat.com>
      Reviewed-by: NJosh Durgin <jdurgin@redhat.com>
      Reviewed-by: NAlex Elder <elder@linaro.org>
      cf32bd9c
    • Y
      ceph: fix atomic_open snapdir · bf91c315
      Yan, Zheng 提交于
      ceph_handle_snapdir() checks ceph_mdsc_do_request()'s return value
      and creates snapdir inode if it's -ENOENT
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      bf91c315
    • Y
      ceph: properly mark empty directory as complete · 2f92b3d0
      Yan, Zheng 提交于
      ceph_add_cap() calls __check_cap_issue(), which clears directory
      inode' complete flag. so we should set the complete flag for empty
      directory should be set after calling ceph_add_cap().
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      2f92b3d0
    • Y
      client: include kernel version in client metadata · a6a5ce4f
      Yan, Zheng 提交于
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      a6a5ce4f
    • Y
      ceph: provide seperate {inode,file}_operations for snapdir · 38c48b5f
      Yan, Zheng 提交于
      remove all unsupported operations from {inode,file}_operations.
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      38c48b5f
    • Y
      ceph: fix request time stamp encoding · 1f041a89
      Yan, Zheng 提交于
      struct timespec uses 'long' to present second and nanosecond. 'long'
      is 64 bits on 64bits machine. ceph MDS expects time stamp to be
      encoded as struct ceph_timespec, which uses 'u32' to present second
      and nanosecond.
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      1f041a89
    • Y
      ceph: fix reading inline data when i_size > PAGE_SIZE · fcc02d2a
      Yan, Zheng 提交于
      when inode has inline data but its size > PAGE_SIZE (it was truncated
      to larger size), previous direct read code return -EIO. This patch adds
      code to return zeros for data whose offset > PAGE_SIZE.
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      fcc02d2a
    • Y
      ceph: avoid block operation when !TASK_RUNNING (ceph_mdsc_close_sessions) · 86d8f67b
      Yan, Zheng 提交于
      use an atomic variable to track number of sessions, this can avoid block
      operation inside wait loops.
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      86d8f67b
    • Y
      ceph: avoid block operation when !TASK_RUNNING (ceph_get_caps) · c4d4a582
      Yan, Zheng 提交于
      we should not do block operation in wait_event_interruptible()'s condition
      check function, but reading inline data can block. so move the read inline
      data code to ceph_get_caps()
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      c4d4a582
    • Y
      ceph: avoid block operation when !TASK_RUNNING (ceph_mdsc_sync) · d3383a8e
      Yan, Zheng 提交于
      check_cap_flush() calls mutex_lock(), which may block. So we can't
      use it as condition check function for wait_event();
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      d3383a8e
    • I
      rbd: fix error paths in rbd_dev_refresh() · 73e39e4d
      Ilya Dryomov 提交于
      header_rwsem should be released on errors.  Also remove useless
      rbd_dev->mapping.size != rbd_dev->header.image_size test.
      Signed-off-by: NIlya Dryomov <idryomov@redhat.com>
      73e39e4d
    • Y
      ceph: improve reference tracking for snaprealm · 982d6011
      Yan, Zheng 提交于
      When snaprealm is created, its initial reference count is zero.
      But in some rare cases, the newly created snaprealm is not referenced
      by anyone. This causes snaprealm with zero reference count not freed.
      
      The fix is set reference count of newly snaprealm to 1. The reference
      is return the function who requests to create the snaprealm. When the
      function finishes its job, it releases the reference.
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      982d6011
    • Y
      ceph: properly zero data pages for file holes. · 1487a688
      Yan, Zheng 提交于
      A bug is found in striped_read() of fs/ceph/file.c. striped_read() calls
      ceph_zero_pape_vector_range().  The first argument, page_align + read + ret,
      passed to ceph_zero_pape_vector_range() is wrong.
      
      When a file has holes, this wrong parameter may cause memory corruption
      either in kernal space or user space. Kernel space memory may be corrupted in
      the case of non direct IO; user space memory may be corrupted in the case of
      direct IO. In the latter case, the application doing direct IO may crash due
      to memory corruption, as we have experienced.
      
      The correct value should be initial_align + read + ret, where intial_align =
      o_direct ? buf_align : io_align.  Compared with page_align, the current page
      offest, initial_align is the initial page offest, which should be used to
      calculate the page and offset in ceph_zero_pape_vector_range().
      Reported-by: Ncaifeng zhu <zhucaifeng@unissoft-nj.com>
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      1487a688
    • R
      ceph: acl: Remove unused function · 671762f8
      Rickard Strandqvist 提交于
      Remove the function ceph_get_cached_acl() that is not used anywhere.
      
      This was partially found by using a static code analysis program called cppcheck.
      Signed-off-by: NRickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
      Reviewed-by: NYan, Zheng <zyan@redhat.com>
      671762f8
    • R
      rbd: nuke copy_token() · 3a25cf43
      Rickard Strandqvist 提交于
      It's been largely superseded by dup_token() and unused for over
      2 years, identified by cppcheck.
      Signed-off-by: NRickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
      [idryomov@redhat.com: changelog]
      Signed-off-by: NIlya Dryomov <idryomov@redhat.com>
      3a25cf43
    • Y
      ceph: handle SESSION_FORCE_RO message · 03f4fcb0
      Yan, Zheng 提交于
      mark session as readonly and wake up all cap waiters.
      Signed-off-by: NYan, Zheng <zyan@redhat.com>
      03f4fcb0
    • I
      f646912d
    • I
      libceph: nuke pool op infrastructure · 7a6fdeb2
      Ilya Dryomov 提交于
      On Mon, Dec 22, 2014 at 5:35 PM, Sage Weil <sage@newdream.net> wrote:
      > On Mon, 22 Dec 2014, Ilya Dryomov wrote:
      >> Actually, pool op stuff has been unused for over two years - looks like
      >> it was added for rbd create_snap and that got ripped out in 2012.  It's
      >> unlikely we'd ever need to manage pools or snaps from the kernel client
      >> so I think it makes sense to nuke it.  Sage?
      >
      > Yep!
      Signed-off-by: NIlya Dryomov <idryomov@redhat.com>
      7a6fdeb2
    • L
      Merge tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux · b2b89ebf
      Linus Torvalds 提交于
      Pull file locking fixes from Jeff Layton:
       "A small set of patches to fix problems with the recent file locking
        changes that we discussed earlier this week"
      "
      
      * tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux:
        locks: fix list insertion when lock is split in two
        locks: remove conditional lock release in middle of flock_lock_file
        locks: only remove leases associated with the file being closed
        Revert "locks: keep a count of locks on the flctx lists"
      b2b89ebf
    • L
      Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic · eaa0eda5
      Linus Torvalds 提交于
      Pull asm-generic uaccess.h cleanup from Arnd Bergmann:
       "Like in 3.19, I once more have a multi-stage cleanup for one
        asm-generic header file, this time the work was done by Michael
        Tsirkin and cleans up the uaccess.h file in asm-generic, as well as
        all architectures for which the respective maintainers did not pick up
        his patches directly"
      
      * tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: (37 commits)
        sparc32: nocheck uaccess coding style tweaks
        sparc64: nocheck uaccess coding style tweaks
        xtensa: macro whitespace fixes
        sh: macro whitespace fixes
        parisc: macro whitespace fixes
        m68k: macro whitespace fixes
        m32r: macro whitespace fixes
        frv: macro whitespace fixes
        cris: macro whitespace fixes
        avr32: macro whitespace fixes
        arm64: macro whitespace fixes
        arm: macro whitespace fixes
        alpha: macro whitespace fixes
        blackfin: macro whitespace fixes
        sparc64: uaccess_64 macro whitespace fixes
        sparc32: uaccess_32 macro whitespace fixes
        avr32: whitespace fix
        sh: fix put_user sparse errors
        metag: fix put_user sparse errors
        ia64: fix put_user sparse errors
        ...
      eaa0eda5
    • L
      Merge tag 'pci-v3.20-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · cad3ab58
      Linus Torvalds 提交于
      Pull PCI resource management fix from Bjorn Helgaas:
       "This fixes a double kfree in code we merged for v3.20:
      
        Remove duplicate kfree in of_pci_get_host_bridge_resources() (Lorenzo
        Pieralisi)"
      
      * tag 'pci-v3.20-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        of/pci: Remove duplicate kfree in of_pci_get_host_bridge_resources()
      cad3ab58
    • L
      Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 53861af9
      Linus Torvalds 提交于
      Pull virtio updates from Rusty Russell:
       "OK, this has the big virtio 1.0 implementation, as specified by OASIS.
      
        On top of tht is the major rework of lguest, to use PCI and virtio
        1.0, to double-check the implementation.
      
        Then comes the inevitable fixes and cleanups from that work"
      
      * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (80 commits)
        virtio: don't set VIRTIO_CONFIG_S_DRIVER_OK twice.
        virtio_net: unconditionally define struct virtio_net_hdr_v1.
        tools/lguest: don't use legacy definitions for net device in example launcher.
        virtio: Don't expose legacy net features when VIRTIO_NET_NO_LEGACY defined.
        tools/lguest: use common error macros in the example launcher.
        tools/lguest: give virtqueues names for better error messages
        tools/lguest: more documentation and checking of virtio 1.0 compliance.
        lguest: don't look in console features to find emerg_wr.
        tools/lguest: don't start devices until DRIVER_OK status set.
        tools/lguest: handle indirect partway through chain.
        tools/lguest: insert driver references from the 1.0 spec (4.1 Virtio Over PCI)
        tools/lguest: insert device references from the 1.0 spec (4.1 Virtio Over PCI)
        tools/lguest: rename virtio_pci_cfg_cap field to match spec.
        tools/lguest: fix features_accepted logic in example launcher.
        tools/lguest: handle device reset correctly in example launcher.
        virtual: Documentation: simplify and generalize paravirt_ops.txt
        lguest: remove NOTIFY call and eventfd facility.
        lguest: remove NOTIFY facility from demonstration launcher.
        lguest: use the PCI console device's emerg_wr for early boot messages.
        lguest: always put console in PCI slot #1.
        ...
      53861af9
    • L
      Merge tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 5c277007
      Linus Torvalds 提交于
      Pull MFD updates from Lee Jones:
       "Changes to existing drivers:
         - fixr platform device collision; da9052, wm8994-core
         - regmap configuration amendments; tps65218
         - fix runtime PM deadlock; rtsx_usb
         - remove unused/superfluous code; db8500-prcmu, omap-usb-host
         - enable watchdog timer; lpc_sch
         - add start/stop RX URBs helpers; dln2
         - remove platform device (DT only); max77686, max77802
         - support suspend and resume; dln2
         - add Device Tree support; da9063
         - extra error checking; intel_soc_pmic
         - const'ify all the things; 88pm860x, hi6421-pmic, intel_soc_pmic,
                                     max77686, lm3533, retu, pcf50633,
                                     davinci_voicecodec, smsc-ece1099,
                                     tps65218, mc13xxx, tps65217, twl-core,
                                     twl6040
      
        New drivers/supported devices:
         - new driver for Richtek RT5033
         - new driver for DA9150 Charger and FuelGauge
         - new driver for Qualcomm Resource Power Manager (RPM)
         - add support for the ir-clk into sun6i-prcm
         - add support for FuelGauge into axp20x"
      
      * tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (32 commits)
        mfd: intel_soc_pmic: Add missing error check for devm_kzalloc
        mfd: rtsx_usb: Defer autosuspend while card exists
        mfd: devicetree: Add bindings for DA9063
        mfd: da9063: Add device tree support
        regulator: qcom-rpm: Add missing state flag in call to RPM
        mfd: qcom-rpm: Driver for the Qualcomm RPM
        mfd: devicetree: bindings: Add Qualcomm RPM DT binding
        mfd: max77686/802: Remove support for board files
        mfd: omap-usb-host: Remove some unused functions
        mfd: twl6040: Constify struct regmap_config and reg_default array
        mfd: twl-core: Constify struct regmap_config and reg_default array
        mfd: tps65217: Constify struct regmap_config
        mfd: mc13xxx: i2c/spi: Constify struct regmap_config
        mfd: tps65218: Constify struct regmap_config
        mfd: smsc-ece1099: Constify struct regmap_config
        mfd: davinci_voicecodec: Constify struct regmap_config
        mfd: pcf50633: Constify struct regmap_config
        mfd: retu: Constify struct regmap_config
        mfd: lm3533: Constify struct regmap_config
        mfd: max77686: Constify struct regmap_config
        ...
      5c277007