Skip to contentSkip to conversation

GFS2: Pull request (merge window)

DISCUSSION Steven Whitehouse 1 participant 1 message Mar 20, 2012

lore
Share & tools
lore
#0 lore raw

Hi,

Please consider pulling the following changes. The only change since the initial patch posting is a three line bug fix from Bob Peterson,

Steve.

------------------------------------------------------------------------------
The following changes since commit 891003abb0db6bfffd61b76ad0ed39bb7c3db8e1:

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes (2012-02-28 09:17:31 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git master

Benjamin Marzinski (1):
GFS2: call gfs2_write_alloc_required for each chunk

Bob Peterson (5):
GFS2: Sort the ordered write list
GFS2: Unlock rindex mutex on glock error
GFS2: Eliminate sd_rindex_mutex
GFS2: make sure rgrps are up to date in func gfs2_blk2rgrpd
GFS2: Change truncate page allocation to be GFP_NOFS

Steven Whitehouse (7):
GFS2: glock statistics gathering
GFS2: Move two functions from log.c to lops.c
GFS2: FITRIM ioctl support
GFS2: Make bd_cmp() static
GFS2: Flush pending glock work when evicting an inode
GFS2: Remove a __GFP_NOFAIL allocation
GFS2: Clean up log flush header writing

 fs/gfs2/bmap.c              |    4 +-
 fs/gfs2/file.c              |   15 ++-
 fs/gfs2/glock.c             |  210 +++++++++++++++++++++++++++++++++++--
 fs/gfs2/incore.h            |   50 ++++++++-
 fs/gfs2/inode.c             |    4 +-
 fs/gfs2/lock_dlm.c          |  123 +++++++++++++++++++++-
 fs/gfs2/log.c               |  244 +++++++++++++++----------------------------
 fs/gfs2/log.h               |    5 +-
 fs/gfs2/lops.c              |   95 +++++++++++++++++-
 fs/gfs2/main.c              |   18 +++
 fs/gfs2/ops_fstype.c        |    9 ++-
 fs/gfs2/quota.c             |    2 +-
 fs/gfs2/rgrp.c              |  189 ++++++++++++++++++++++++++--------
 fs/gfs2/rgrp.h              |   10 +-
 fs/gfs2/super.c             |    3 +-
 fs/gfs2/trace_gfs2.h        |   60 +++++++++++-
 fs/gfs2/util.c              |    1 +
 fs/gfs2/util.h              |    3 +
 fs/gfs2/xattr.c             |    4 +-
 include/linux/gfs2_ondisk.h |    1 +
 20 files changed, 805 insertions(+), 245 deletions(-)