Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 3962dfbe
    Linus Torvalds authored
    Pull btrfs fixes from Chris Mason:
     "We have a small collection of fixes in my for-linus branch.
    
      The big thing that stands out is a revert of a new ioctl.  Users
      haven't shipped yet in btrfs-progs, and Dave Sterba found a better way
      to export the information"
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
      Btrfs: use right clone root offset for compressed extents
      btrfs: fix null pointer deference at btrfs_sysfs_add_one+0x105
      Btrfs: unset DCACHE_DISCONNECTED when mounting default subvol
      Btrfs: fix max_inline mount option
      Btrfs: fix a lockdep warning when cleaning up aborted transaction
      Revert "btrfs: add ioctl to export size of global metadata reservation"
    3962dfbe