History

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

Pull gfs2 updates from Andreas Gruenbacher: - Log space and revoke accounting rework to fix some failed asserts. - Local resource group glock sharing for better local performance. - Add support for version 1802 filesystems: trusted xattr support and '-o rgrplvb' mounts by default. - Actually synchronize on the inode glock's FREEING bit during withdraw ("gfs2: fix glock confusion in function signal_our_withdraw"). - Fix parallel recovery of multiple journals ("gfs2: keep bios separate for each journal"). - Various other bug fixes. * tag 'gfs2-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2: (49 commits) gfs2: Don't get stuck with I/O plugged in gfs2_ail1_flush gfs2: Per-revoke accounting in transactions gfs2: Rework the log space allocation logic gfs2: Minor calc_reserved cleanup gfs2: Use resource group glock sharing gfs2: Allow node-wide exclusive glock sharing gfs2: Add local resource group locking gfs2: Add per-reservation reserved block accounting gfs2: Rename rs_{free -> requested} and rd_{reserved -> requested} gfs2: Check for active reservation in gfs2_release gfs2: Don't search for unreserved space twice gfs2: Only pass reservation down to gfs2_rbm_find gfs2: Also reflect single-block allocations in rgd->rd_extfail_pt gfs2: Recursive gfs2_quota_hold in gfs2_iomap_end gfs2: Add trusted xattr support gfs2: Enable rgrplvb for sb_fs_format 1802 gfs2: Don't skip dlm unlock if glock has an lvb gfs2: Lock imbalance on error path in gfs2_recover_one gfs2: Move function gfs2_ail_empty_tr gfs2: Get rid of current_tail() ...

Linus Torvalds committed 5 years ago

Commit f6e1e1d2 parents 7d6beb7 17d776826 files · +967 −662Browse files

Showing the changes to include/uapi (1 of 26 files). Show all

Unified · Split

include/uapi/linux/gfs2_ondisk.h+3−2
@@ -47,7 +47,7 @@ · 46 unmodified lines
4747 #define GFS2_FORMAT_DE 1200
4848 #define GFS2_FORMAT_QU 1500
4949 /* These are part of the superblock */
50−#define GFS2_FORMAT_FS 1801
50+#define GFS2_FORMAT_FS 1802
5151 #define GFS2_FORMAT_MULTI 1900
5252
5353 /*
@@ -389,8 +389,9 @@ struct gfs2_leaf { · 335 unmodified lines
389389 #define GFS2_EATYPE_USR 1
390390 #define GFS2_EATYPE_SYS 2
391391 #define GFS2_EATYPE_SECURITY 3
392+#define GFS2_EATYPE_TRUSTED 4
392393
393−#define GFS2_EATYPE_LAST 3
394+#define GFS2_EATYPE_LAST 4
394395 #define GFS2_EATYPE_VALID(x) ((x) <= GFS2_EATYPE_LAST)
395396
396397 #define GFS2_EAFLAG_LAST 0x01 /* last ea in block */