Skip to contentSkip to conversation

GFS2 changes for the 5.5 merge window

GIT PULL Merged Andreas Gruenbacher 2 participants 2 messages Dec 5, 2019

lore
Share & tools
lore
#0 lore raw

Hi Linus,

could you please consider pulling the following gfs2 changes?

Thanks a lot,
Andreas

The following changes since commit d5798141fd54cea074c3429d5803f6c41ade0ca8:

gfs2: Fix initialisation of args for remount (2019-10-30 12:16:53 +0100)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git tags/gfs2-for-5.5

for you to fetch changes up to ade48088937f53fe0467162177726176813b9564:

gfs2: Don't write log headers after file system withdraw (2019-11-21 11:37:41 +0100)

----------------------------------------------------------------
GFS2 changes for this merge window:

Bob's extensive filesystem withdrawal and recovery testing:
- Don't write log headers after file system withdraw
- clean up iopen glock mess in gfs2_create_inode
- Close timing window with GLF_INVALIDATE_IN_PROGRESS
- Abort gfs2_freeze if io error is seen
- Don't loop forever in gfs2_freeze if withdrawn
- fix infinite loop in gfs2_ail1_flush on io error
- Introduce function gfs2_withdrawn
- fix glock reference problem in gfs2_trans_remove_revoke

Filesystems with a block size smaller than the page size:
- Fix end-of-file handling in gfs2_page_mkwrite
- Improve mmap write vs. punch_hole consistency

Other:
- Remove active journal side effect from gfs2_write_log_header
- Multi-block allocations in gfs2_page_mkwrite

Minor cleanups and coding style fixes:
- Remove duplicate call from gfs2_create_inode
- make gfs2_log_shutdown static
- make gfs2_fs_parameters static
- Some whitespace cleanups
- removed unnecessary semicolon

----------------------------------------------------------------
Aliasgar Surti (1):
gfs2: removed unnecessary semicolon

Andreas Gruenbacher (6):
gfs2: Some whitespace cleanups
gfs2: Improve mmap write vs. punch_hole consistency
gfs2: Multi-block allocations in gfs2_page_mkwrite
gfs2: Fix end-of-file handling in gfs2_page_mkwrite
gfs2: Remove active journal side effect from gfs2_write_log_header
gfs2: Remove duplicate call from gfs2_create_inode

Ben Dooks (Codethink) (1):
gfs2: make gfs2_fs_parameters static

Bob Peterson (9):
gfs2: make gfs2_log_shutdown static
gfs2: fix glock reference problem in gfs2_trans_remove_revoke
gfs2: Introduce function gfs2_withdrawn
gfs2: fix infinite loop in gfs2_ail1_flush on io error
gfs2: Don't loop forever in gfs2_freeze if withdrawn
gfs2: Abort gfs2_freeze if io error is seen
gfs2: Close timing window with GLF_INVALIDATE_IN_PROGRESS
gfs2: clean up iopen glock mess in gfs2_create_inode
gfs2: Don't write log headers after file system withdraw

 fs/gfs2/aops.c       |  6 +++---
 fs/gfs2/bmap.c       | 11 +++++++++--
 fs/gfs2/file.c       | 56 ++++++++++++++++++++++++++++++++--------------------
 fs/gfs2/glock.c      | 16 ++++++++++-----
 fs/gfs2/glops.c      |  4 ++--
 fs/gfs2/inode.c      | 16 +++++++--------
 fs/gfs2/log.c        | 25 +++++++++++++++++++----
 fs/gfs2/log.h        |  2 +-
 fs/gfs2/lops.c       | 34 +++++++++++++++----------------
 fs/gfs2/lops.h       |  3 ++-
 fs/gfs2/meta_io.c    |  6 +++---
 fs/gfs2/ops_fstype.c |  5 ++---
 fs/gfs2/quota.c      |  4 ++--
 fs/gfs2/recovery.c   |  8 +++++---
 fs/gfs2/super.c      | 33 ++++++++++++++++++-------------
 fs/gfs2/sys.c        |  2 +-
 fs/gfs2/trans.c      |  2 ++
 fs/gfs2/util.c       |  2 +-
 fs/gfs2/util.h       |  9 +++++++++
 19 files changed, 152 insertions(+), 92 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Thu, 5 Dec 2019 20:09:15 +0100:

The pull request you sent on Thu, 5 Dec 2019 20:09:15 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git tags/gfs2-for-5.5

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/3f1266ec704d3efcfc8179c71bed9a75963b6344

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker