From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 22 Mar 2012 01:00:03 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw
X-Git-Tag: v3.4-rc1~161
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=ad12ab259d9131a53aa11c7c4561d97f7cc900df;p=cascardo%2Flinux.git

Merge git://git./linux/kernel/git/steve/gfs2-3.0-nmw

Pull gfs2 changes from Steven Whitehouse.

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
  GFS2: Change truncate page allocation to be GFP_NOFS
  GFS2: call gfs2_write_alloc_required for each chunk
  GFS2: Clean up log flush header writing
  GFS2: Remove a __GFP_NOFAIL allocation
  GFS2: Flush pending glock work when evicting an inode
  GFS2: make sure rgrps are up to date in func gfs2_blk2rgrpd
  GFS2: Eliminate sd_rindex_mutex
  GFS2: Unlock rindex mutex on glock error
  GFS2: Make bd_cmp() static
  GFS2: Sort the ordered write list
  GFS2: FITRIM ioctl support
  GFS2: Move two functions from log.c to lops.c
  GFS2: glock statistics gathering
---

ad12ab259d9131a53aa11c7c4561d97f7cc900df