tree b672082875eea08035930888ffda3177599c0c43
parent 78bbf153fa96e5e40234b7b05567602535645460
parent 325c50e3cebb9208009083e841550f98a863bfa0
author Linus Torvalds <torvalds@linux-foundation.org> 1474663177 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1474663177 -0700

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

Pull btrfs fixes from Chris Mason:
 "Josef fixed a problem when quotas are enabled with his latest ENOSPC
  rework, and Jeff added more checks into the subvol ioctls to avoid
  tripping up lookup_one_len"

* 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: ensure that file descriptor used with subvol ioctls is a dir
  Btrfs: handle quota reserve failure properly