tree ba2c54bee79d46dbd7855fb6b87fa0487c761808
parent d5a74afd08738af84d51c353ac3ac200b06c51d7
parent a365fbf354907430e6852f0c373b4b3eeff81ba3
author Linus Torvalds <torvalds@linux-foundation.org> 1330449451 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1330449451 -0800

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

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
  GFS2: Read resource groups on mount
  GFS2: Ensure rindex is uptodate for fallocate
  GFS2: Read in rindex if necessary during unlink
  GFS2: Fix race between lru_list and glock ref count