Hi, Please consider pulling the following changes, Steve. ---------------------------------------------------------------------------------- The following changes since commit 0df1f2487d2f0d04703f142813d53615d62a1da4: Linux 3.18-rc3 (2014-11-02 15:01:51 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git tags/gfs2-merge-window for you to fetch changes up to ec7d879c457611e540cb465c25f3040facbd1185: GFS2: gfs2_atomic_open(): simplify the use of finish_no_open() (2014-11-20 11:18:08 +0000) ---------------------------------------------------------------- In contrast to recent merge windows, there are a number of interesting features this time. There is a set of patches to improve performance in relation to block reservations. Some correctness fixes for fallocate, and an update to the freeze/thaw code which greatly simplyfies this code path. In addition there is a set of clean ups from Al Viro too. ---------------------------------------------------------------- Al Viro (5): GFS2: bugger off early if O_CREAT open finds a directory GFS2: gfs2_create_inode(): don't bother with d_splice_alias() GFS2: use kvfree() instead of open-coding it GFS2: gfs2_dir_get_hash_table(): avoiding deferred vfree() is easy here... GFS2: gfs2_atomic_open(): simplify the use of finish_no_open() Andrew Price (3): GFS2: Use inode_newsize_ok and get_write_access in fallocate GFS2: Update i_size properly on fallocate GFS2: Update timestamps on fallocate Benjamin Marzinski (2): fs: add freeze_super/thaw_super fs hooks GFS2: update freeze code to use freeze/thaw_super on all nodes Bob Peterson (3): GFS2: Set of distributed preferences for rgrps GFS2: Only increase rs_sizehint GFS2: If we use up our block reservation, request more next time Fabian Frederick (1): GFS2: directly return gfs2_dir_check() Markus Elfring (1): GFS2: Deletion of unnecessary checks before two function calls fs/block_dev.c | 10 ++++- fs/gfs2/dir.c | 39 ++++-------------- fs/gfs2/file.c | 83 ++++++++++++++++++++++++-------------- fs/gfs2/glock.c | 3 +- fs/gfs2/glops.c | 26 ++++++------ fs/gfs2/glops.h | 2 + fs/gfs2/incore.h | 19 ++++++--- fs/gfs2/inode.c | 72 +++++++++------------------------ fs/gfs2/log.c | 42 +++++++++---------- fs/gfs2/main.c | 11 ++++- fs/gfs2/ops_fstype.c | 18 +++------ fs/gfs2/quota.c | 9 +---- fs/gfs2/rgrp.c | 69 ++++++++++++++++++++++++++++--- fs/gfs2/rgrp.h | 1 + fs/gfs2/super.c | 112 ++++++++++++++++++++++++++++++++++----------------- fs/gfs2/super.h | 1 + fs/gfs2/trans.c | 17 ++++++-- fs/ioctl.c | 6 ++- include/linux/fs.h | 2 + 19 files changed, 315 insertions(+), 227 deletions(-)