mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 12:43:29 +02:00
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() ...
This commit is contained in:
@@ -47,7 +47,7 @@
|
||||
#define GFS2_FORMAT_DE 1200
|
||||
#define GFS2_FORMAT_QU 1500
|
||||
/* These are part of the superblock */
|
||||
#define GFS2_FORMAT_FS 1801
|
||||
#define GFS2_FORMAT_FS 1802
|
||||
#define GFS2_FORMAT_MULTI 1900
|
||||
|
||||
/*
|
||||
@@ -389,8 +389,9 @@ struct gfs2_leaf {
|
||||
#define GFS2_EATYPE_USR 1
|
||||
#define GFS2_EATYPE_SYS 2
|
||||
#define GFS2_EATYPE_SECURITY 3
|
||||
#define GFS2_EATYPE_TRUSTED 4
|
||||
|
||||
#define GFS2_EATYPE_LAST 3
|
||||
#define GFS2_EATYPE_LAST 4
|
||||
#define GFS2_EATYPE_VALID(x) ((x) <= GFS2_EATYPE_LAST)
|
||||
|
||||
#define GFS2_EAFLAG_LAST 0x01 /* last ea in block */
|
||||
|
Reference in New Issue
Block a user