tree af5a871d8685c0baca9c4b8fcf31cb9f5454374a
parent 2b9d1c050d291693f257c98605028325f8146c84
parent cfd4a535b68faf651b238586011f5bae128391c4
author Linus Torvalds <torvalds@linux-foundation.org> 1398630388 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1398630388 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull btrfs fixes from Chris Mason.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: limit the path size in send to PATH_MAX
  Btrfs: correctly set profile flags on seqlock retry
  Btrfs: use correct key when repeating search for extent item
  Btrfs: fix inode caching vs tree log
  Btrfs: fix possible memory leaks in open_ctree()
  Btrfs: avoid triggering bug_on() when we fail to start inode caching task
  Btrfs: move btrfs_{set,clear}_and_info() to ctree.h
  btrfs: replace error code from btrfs_drop_extents
  btrfs: Change the hole range to a more accurate value.
  btrfs: fix use-after-free in mount_subvol()