tree 4181f24300881fb9de4846ce2bb0edfda2a3b60d
parent 7067552dfb382cef040326ab6dd0b8d642af3e64
parent 7bd9ee58a4fe026514266757e812cb89c3c945eb
author Linus Torvalds <torvalds@linux-foundation.org> 1376929812 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1376929812 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes

Pull gfs2 fixes from Steven Whitehouse:
 "Out of these five patches, the one for ensuring that the number of
  revokes is not exceeded, and the one for checking the glock is not
  already held in gfs2_getxattr are the two most important.  The latter
  can be triggered by selinux.

  The other three patches are very small and fix mostly fairly trivial
  issues"

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
  GFS2: Check for glock already held in gfs2_getxattr
  GFS2: alloc_workqueue() doesn't return an ERR_PTR
  GFS2: don't overrun reserved revokes
  GFS2: WQ_NON_REENTRANT is meaningless and going away
  GFS2: Fix typo in gfs2_create_inode()