commit 80dcc31fbe55932ac9204daee5f2ebc0c49b6da3
author Linus Torvalds <torvalds@linux-foundation.org> Tue Apr 14 16:09:18 2015 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Apr 14 16:09:18 2015 -0700
tree 723802ccd7e96da883352704fe3d2c5e3ba9d2e6
parent 78d5dcda92a17f17132671c269ea2c3a17688649
parent 30133177957dca9a3e2a37b720f891d3225a92a1

Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2

Pull GFS2 updates from Bob Peterson:
 "Here is a list of patches we've accumulated for GFS2 for the current
  upstream merge window.

  Most of the patches fix GFS2 quotas, which were not properly enforced.
  There's another that adds me as a GFS2 co-maintainer, and a couple
  patches that fix a kernel panic doing splice_write on GFS2 as well as
  a few correctness patches"

* tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: fix quota refresh race in do_glock()
  gfs2: incorrect check for debugfs returns
  gfs2: allow fallocate to max out quotas/fs efficiently
  gfs2: allow quota_check and inplace_reserve to return available blocks
  gfs2: perform quota checks against allocation parameters
  GFS2: Move gfs2_file_splice_write outside of #ifdef
  GFS2: Allocate reservation during splice_write
  GFS2: gfs2_set_acl(): Cache "no acl" as well
  Add myself (Bob Peterson) as a maintainer of GFS2