Commit afcbce74 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gfs2-for-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 

Pull gfs2 updates from Andreas Gruenbacher:

 - Major withdraw / error handling overhaul based on dlm's new
   DLM_RELEASE_RECOVER feature: this allows gfs to treat withdraws like
   node failures. Make withdraws asynchronous

 - Fix a bug in commit e4a8b548 that caused 'df' to remain out of
   sync. ('df' is still allowed to go slightly out of sync for short
   periods of time)

 - Prevent recusive memory reclaim in gfs2_unstuff_dinode()

 - Clean up SDF_JOURNAL_LIVE flag handling

 - Fix remote evict for read-only filesystems

 - Fix a misuse of bio_chain()

 - Various other minor cleanups

* tag 'gfs2-for-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2: (35 commits)
  gfs2: Fix use of bio_chain
  gfs2: Clean up SDF_JOURNAL_LIVE flag handling
  gfs2: No longer thaw filesystems during a withdraw
  gfs2: Withdraw immediately in gfs2_trans_add_meta
  gfs2: New gfs2_withdraw_helper
  gfs2: Clean up properly during a withdraw
  gfs2: Rename gfs2_{gl_dq_holders => withdraw_glocks}
  Revert "gfs2: fix infinite loop when checking ail item count before go_inval"
  Revert "gfs2: Allow some glocks to be used during withdraw"
  Revert "gfs2: Check for log write errors before telling dlm to unlock"
  Revert "gfs2: fix a deadlock on withdraw-during-mount"
  Revert "gfs2: Force withdraw to replay journals and wait for it to finish" (6/6)
  Revert "gfs2: Force withdraw to replay journals and wait for it to finish" (5/6)
  Revert "gfs2: Force withdraw to replay journals and wait for it to finish" (4/6)
  Revert "gfs2: Force withdraw to replay journals and wait for it to finish" (3/6)
  Revert "gfs2: Force withdraw to replay journals and wait for it to finish" (2/6)
  Revert "gfs2: Force withdraw to replay journals and wait for it to finish" (1/6)
  Revert "gfs2: don't stop reads while withdraw in progress"
  gfs2: Rename LM_FLAG_{NOEXP -> RECOVER}
  gfs2: Kill gfs2_io_error_bh_wd
  ...
parents 86973754 8a157e0a

Documentation/filesystems/gfs2.rst→Documentation/filesystems/gfs2/index.rst

+12 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 
Global File System 2

====================



Overview

========



GFS2 is a cluster file system. It allows a cluster of computers to

simultaneously use a block device that is shared between them (with FC,

iSCSI, NBD, etc).  GFS2 reads and writes to the block device like a local
@@ -50,3 +53,12 @@ The following man pages are available from gfs2-utils: 
  gfs2_convert		to convert a gfs filesystem to GFS2 in-place

  mkfs.gfs2		to make a filesystem

  ============		=============================================



Implementation Notes

====================



.. toctree::

   :maxdepth: 1



   glocks

   uevents

Documentation/filesystems/index.rst

+1 −3
Original line number Diff line number Diff line
@@ -89,9 +89,7 @@ Documentation for filesystem implementations. 
   ext3

   ext4/index

   f2fs

   gfs2

   gfs2-uevents

   gfs2-glocks

   gfs2/index

   hfs

   hfsplus

   hpfs

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10535,7 +10535,7 @@ L: gfs2@lists.linux.dev 
S:	Supported

B:	https://bugzilla.kernel.org/enter_bug.cgi?product=File%20System&component=gfs2

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git

F:	Documentation/filesystems/gfs2*

F:	Documentation/filesystems/gfs2/

F:	fs/gfs2/

F:	include/uapi/linux/gfs2_ondisk.h