diff options
| author | Christian Brauner <brauner@kernel.org> | 2023-08-23 13:06:55 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2023-08-23 13:06:55 +0200 |
| commit | 3fb5a6562adef115d8a8c3e19cc9d5fae32e93c8 (patch) | |
| tree | 7a0cc61be2ba75aab26403f330da3140424b6b76 /block/bdev.c | |
| parent | 051178c366bbc1bf8b4aba5ca5519d7da453c95f (diff) | |
| parent | 59ba4fdd2d1f9dd7af98f5168c846150c9aec56d (diff) | |
Merge tag 'vfs-6.6-merge-2' of ssh://gitolite.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull filesystem freezing updates from Darrick Wong:
New code for 6.6:
* Allow the kernel to initiate a freeze of a filesystem. The kernel
and userspace can both hold a freeze on a filesystem at the same
time; the freeze is not lifted until /both/ holders lift it. This
will enable us to fix a longstanding bug in XFS online fsck.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Message-Id: <20230822182604.GB11286@frogsfrogsfrogs>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'block/bdev.c')
| -rw-r--r-- | block/bdev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/block/bdev.c b/block/bdev.c index a20263fa27a4..f3b13aa1b7d4 100644 --- a/block/bdev.c +++ b/block/bdev.c @@ -231,9 +231,9 @@ int freeze_bdev(struct block_device *bdev) if (!sb) goto sync; if (sb->s_op->freeze_super) - error = sb->s_op->freeze_super(sb); + error = sb->s_op->freeze_super(sb, FREEZE_HOLDER_USERSPACE); else - error = freeze_super(sb); + error = freeze_super(sb, FREEZE_HOLDER_USERSPACE); deactivate_super(sb); if (error) { @@ -274,9 +274,9 @@ int thaw_bdev(struct block_device *bdev) goto out; if (sb->s_op->thaw_super) - error = sb->s_op->thaw_super(sb); + error = sb->s_op->thaw_super(sb, FREEZE_HOLDER_USERSPACE); else - error = thaw_super(sb); + error = thaw_super(sb, FREEZE_HOLDER_USERSPACE); if (error) bdev->bd_fsfreeze_count++; else |