Skip to content

Commit afcbce7

Browse files
committed
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 e4a8b54 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 ...
2 parents 8697375 + 8a157e0 commit afcbce7

27 files changed

Lines changed: 396 additions & 768 deletions
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
Global File System 2
55
====================
66

7+
Overview
8+
========
9+
710
GFS2 is a cluster file system. It allows a cluster of computers to
811
simultaneously use a block device that is shared between them (with FC,
912
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:
5053
gfs2_convert to convert a gfs filesystem to GFS2 in-place
5154
mkfs.gfs2 to make a filesystem
5255
============ =============================================
56+
57+
Implementation Notes
58+
====================
59+
60+
.. toctree::
61+
:maxdepth: 1
62+
63+
glocks
64+
uevents
File renamed without changes.

Documentation/filesystems/index.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@ Documentation for filesystem implementations.
8989
ext3
9090
ext4/index
9191
f2fs
92-
gfs2
93-
gfs2-uevents
94-
gfs2-glocks
92+
gfs2/index
9593
hfs
9694
hfsplus
9795
hpfs

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10535,7 +10535,7 @@ L: gfs2@lists.linux.dev
1053510535
S: Supported
1053610536
B: https://bugzilla.kernel.org/enter_bug.cgi?product=File%20System&component=gfs2
1053710537
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
10538-
F: Documentation/filesystems/gfs2*
10538+
F: Documentation/filesystems/gfs2/
1053910539
F: fs/gfs2/
1054010540
F: include/uapi/linux/gfs2_ondisk.h
1054110541

fs/gfs2/aops.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ static int gfs2_read_folio(struct file *file, struct folio *folio)
431431
error = mpage_read_folio(folio, gfs2_block_map);
432432
}
433433

434-
if (gfs2_withdrawing_or_withdrawn(sdp))
434+
if (gfs2_withdrawn(sdp))
435435
return -EIO;
436436

437437
return error;

fs/gfs2/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1446,7 +1446,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
14461446

14471447
if (!(fl->c.flc_flags & FL_POSIX))
14481448
return -ENOLCK;
1449-
if (gfs2_withdrawing_or_withdrawn(sdp)) {
1449+
if (gfs2_withdrawn(sdp)) {
14501450
if (lock_is_unlock(fl))
14511451
locks_lock_file_wait(file, fl);
14521452
return -EIO;

0 commit comments

Comments
 (0)