Hi, Please consider pulling the following changes,
Bob Peterson ---------------------------------------------------------------- GFS2: merge window Here is a list of patches we've accumulated for GFS2 for the current upstream merge window. Most of the patches fix GFS2 quotas, which were not properly enforced. There's another that adds me as a GFS2 co-maintainer, and a couple patches that fix a kernel panic doing splice_write on GFS2 as well as a few correctness patches. ---------------------------------------------------------------- The following changes since commit 28666d6dc3feca2b1983e6011df383299d8b6b64: Add myself (Bob Peterson) as a maintainer of GFS2 (2015-02-24 08:55:30 -0600) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git tags/gfs2-merge-window for you to fetch changes up to 30133177957dca9a3e2a37b720f891d3225a92a1: gfs2: fix quota refresh race in do_glock() (2015-04-08 09:31:18 -0500) ---------------------------------------------------------------- GFS2: merge window Here is a list of patches we've accumulated for GFS2 for the current upstream merge window. Most of the patches fix GFS2 quotas, which were not properly enforced. There's another that adds me as a GFS2 co-maintainer, and a couple patches that fix a kernel panic doing splice_write on GFS2 as well as a few correctness patches. ---------------------------------------------------------------- Abhi Das (4): gfs2: perform quota checks against allocation parameters gfs2: allow quota_check and inplace_reserve to return available blocks gfs2: allow fallocate to max out quotas/fs efficiently gfs2: fix quota refresh race in do_glock() Andreas Gruenbacher (1): GFS2: gfs2_set_acl(): Cache "no acl" as well Bob Peterson (2): GFS2: Allocate reservation during splice_write GFS2: Move gfs2_file_splice_write outside of #ifdef Chengyu Song (1): gfs2: incorrect check for debugfs returns fs/gfs2/acl.c | 6 +--- fs/gfs2/aops.c | 6 ++-- fs/gfs2/bmap.c | 2 +- fs/gfs2/file.c | 101 ++++++++++++++++++++++++++++++++++++++----------------- fs/gfs2/glock.c | 47 +++++++++++++++----------- fs/gfs2/incore.h | 4 ++- fs/gfs2/inode.c | 18 +++++----- fs/gfs2/quota.c | 62 ++++++++++++++++++++++++---------- fs/gfs2/quota.h | 8 +++-- fs/gfs2/rgrp.c | 20 ++++++++--- fs/gfs2/rgrp.h | 3 +- fs/gfs2/xattr.c | 2 +- 12 files changed, 184 insertions(+), 95 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/