Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f124d9ef authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Greg Kroah-Hartman
Browse files

vfs: make freeze_super abort when sync_filesystem returns error 



[ Upstream commit 2719c7160dcfaae1f73a1c0c210ad3281c19022e ]

If we fail to synchronize the filesystem while preparing to freeze the
fs, abort the freeze.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent cfc8b37e

fs/super.c

+12 −7
Original line number Diff line number Diff line
@@ -1691,11 +1691,9 @@ static void lockdep_sb_freeze_acquire(struct super_block *sb) 
		percpu_rwsem_acquire(sb->s_writers.rw_sem + level, 0, _THIS_IP_);

}



static void sb_freeze_unlock(struct super_block *sb)

static void sb_freeze_unlock(struct super_block *sb, int level)

{

	int level;



	for (level = SB_FREEZE_LEVELS - 1; level >= 0; level--)

	for (level--; level >= 0; level--)

		percpu_up_write(sb->s_writers.rw_sem + level);

}
@@ -1766,7 +1764,14 @@ int freeze_super(struct super_block *sb) 
	sb_wait_write(sb, SB_FREEZE_PAGEFAULT);



	/* All writers are done so after syncing there won't be dirty data */

	sync_filesystem(sb);

	ret = sync_filesystem(sb);

	if (ret) {

		sb->s_writers.frozen = SB_UNFROZEN;

		sb_freeze_unlock(sb, SB_FREEZE_PAGEFAULT);

		wake_up(&sb->s_writers.wait_unfrozen);

		deactivate_locked_super(sb);

		return ret;

	}



	/* Now wait for internal filesystem counter */

	sb->s_writers.frozen = SB_FREEZE_FS;
@@ -1778,7 +1783,7 @@ int freeze_super(struct super_block *sb) 
			printk(KERN_ERR

				"VFS:Filesystem freeze failed\n");

			sb->s_writers.frozen = SB_UNFROZEN;

			sb_freeze_unlock(sb);

			sb_freeze_unlock(sb, SB_FREEZE_FS);

			wake_up(&sb->s_writers.wait_unfrozen);

			deactivate_locked_super(sb);

			return ret;
@@ -1829,7 +1834,7 @@ static int thaw_super_locked(struct super_block *sb) 
	}



	sb->s_writers.frozen = SB_UNFROZEN;

	sb_freeze_unlock(sb);

	sb_freeze_unlock(sb, SB_FREEZE_FS);

out:

	wake_up(&sb->s_writers.wait_unfrozen);

	deactivate_locked_super(sb);