Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
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"
No related branches found
No related tags found
Showing
- fs/btrfs/disk-io.c 0 additions, 1 deletionfs/btrfs/disk-io.c
- fs/btrfs/inode.c 1 addition, 1 deletionfs/btrfs/inode.c
- fs/btrfs/ioctl.c 0 additions, 16 deletionsfs/btrfs/ioctl.c
- fs/btrfs/send.c 10 additions, 0 deletionsfs/btrfs/send.c
- fs/btrfs/super.c 9 additions, 2 deletionsfs/btrfs/super.c
- fs/btrfs/sysfs.c 8 additions, 2 deletionsfs/btrfs/sysfs.c
- include/uapi/linux/btrfs.h 0 additions, 1 deletioninclude/uapi/linux/btrfs.h
Loading
Please register or sign in to comment