Hi Linus, please consider pulling the following changes for the GFS2 file system, now without resolving the merge conflict Stephen Rothwell has pointed out between commit
2b070cfe582b ("block: remove the i argument to bio_for_each_segment_all") which is already merged, interacting with commit e21e191994af ("gfs2: read journal in large chunks") which is part of this pull request. Stephen's suggested resolution of the conflict can be found at https://lore.kernel.org/lkml/20190506150707.618f0...@canb.auug.org.au/. Thanks, Andreas The following changes since commit b4b52b881cf08e13d110eac811d4becc0775abbf: Merge tag 'Wimplicit-fallthrough-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux (2019-05-07 12:48:10 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git tags/gfs2-for-5.2 for you to fetch changes up to f4686c26ecc34e8e458b8235f0af5198c9b13bfd: gfs2: read journal in large chunks (2019-05-07 23:39:15 +0200) ---------------------------------------------------------------- We've got the following patches ready for this merge window: "gfs2: Fix loop in gfs2_rbm_find (v2)" A rework of a fix we ended up reverting in 5.0 because of an iozone performance regression. "gfs2: read journal in large chunks" and "gfs2: fix race between gfs2_freeze_func and unmount" An improved version of a commit we also ended up reverting in 5.0 because of a regression in xfstest generic/311. It turns out that the journal changes were mostly innocent and that unfreeze didn't wait for the freeze to complete, which caused the filesystem to be unmounted before it was actually idle. "gfs2: Fix occasional glock use-after-free" "gfs2: Fix iomap write page reclaim deadlock" "gfs2: Fix lru_count going negative" Fixes for various problems reported and partially fixed by Citrix engineers. Thank you very much. "gfs2: clean_journal improperly set sd_log_flush_head" Another fix from Bob. A few other minor cleanups. ---------------------------------------------------------------- Abhi Das (2): gfs2: fix race between gfs2_freeze_func and unmount gfs2: read journal in large chunks Andreas Gruenbacher (7): gfs2: Fix loop in gfs2_rbm_find (v2) gfs2: Fix occasional glock use-after-free gfs2: Remove misleading comments in gfs2_evict_inode gfs2: Remove unnecessary extern declarations gfs2: Rename sd_log_le_{revoke,ordered} gfs2: Rename gfs2_trans_{add_unrevoke => remove_revoke} gfs2: Fix iomap write page reclaim deadlock Bob Peterson (2): gfs2: clean_journal improperly set sd_log_flush_head gfs2: Replace gl_revokes with a GLF flag Ross Lagerwall (1): gfs2: Fix lru_count going negative fs/gfs2/aops.c | 14 ++- fs/gfs2/bmap.c | 118 ++++++++++++++--------- fs/gfs2/bmap.h | 1 + fs/gfs2/dir.c | 2 +- fs/gfs2/glock.c | 25 +++-- fs/gfs2/glops.c | 3 +- fs/gfs2/incore.h | 9 +- fs/gfs2/log.c | 47 ++++++---- fs/gfs2/log.h | 5 +- fs/gfs2/lops.c | 261 ++++++++++++++++++++++++++++++++++++++++++++++----- fs/gfs2/lops.h | 11 +-- fs/gfs2/main.c | 1 - fs/gfs2/ops_fstype.c | 7 +- fs/gfs2/recovery.c | 135 ++------------------------ fs/gfs2/recovery.h | 4 +- fs/gfs2/rgrp.c | 56 +++++------ fs/gfs2/super.c | 20 ++-- fs/gfs2/trans.c | 4 +- fs/gfs2/trans.h | 2 +- fs/gfs2/xattr.c | 6 +- 20 files changed, 438 insertions(+), 293 deletions(-)