mirror of
https://github.com/lkl/linux.git
synced 2025-12-19 08:03:01 +09:00
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>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user