• Linus Torvalds's avatar
    Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · d3f71ae7
    Linus Torvalds authored
    Pull btrfs fixes from Chris Mason:
     "Dave had a small collection of fixes to the new free space tree code,
      one of which was keeping our sysfs files more up to date with feature
      bits as different things get enabled (lzo, raid5/6, etc).
    
      I should have kept the sysfs stuff for rc3, since we always manage to
      trip over something.  This time it was GFP_KERNEL from somewhere that
      is NOFS only.  Instead of rebasing it out I've put a revert in, and
      we'll fix it properly for rc3.
    
      Otherwise, Filipe fixed a btrfs DIO race and Qu Wenruo fixed up a
      use-after-free in our tracepoints that Dave Jones reported"
    
    * 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
      Revert "btrfs: synchronize incompat feature bits with sysfs files"
      btrfs: don't use GFP_HIGHMEM for free-space-tree bitmap kzalloc
      btrfs: sysfs: check initialization state before updating features
      Revert "btrfs: clear PF_NOFREEZE in cleaner_kthread()"
      btrfs: async-thread: Fix a use-after-free error for trace
      Btrfs: fix race between fsync and lockless direct IO writes
      btrfs: add free space tree to the cow-only list
      btrfs: add free space tree to lockdep classes
      btrfs: tweak free space tree bitmap allocation
      btrfs: tests: switch to GFP_KERNEL
      btrfs: synchronize incompat feature bits with sysfs files
      btrfs: sysfs: introduce helper for syncing bits with sysfs files
      btrfs: sysfs: add free-space-tree bit attribute
      btrfs: sysfs: fix typo in compat_ro attribute definition
    d3f71ae7
relocation.c 110 KB