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

Commit 8a3db184 authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by David Sterba
Browse files

btrfs: fix early abort in 'remount' 



Cc: Jeff Mahoney <jeffm@suse.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Josef Bacik <josef@redhat.com>
Signed-off-by: default avatarSergei Trofimovich <slyfox@gentoo.org>
parent 37db63a4

fs/btrfs/super.c

+4 −2
Original line number Diff line number Diff line
@@ -1152,13 +1152,15 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data) 
		if (ret)

			goto restore;

	} else {

		if (fs_info->fs_devices->rw_devices == 0)

		if (fs_info->fs_devices->rw_devices == 0) {

			ret = -EACCES;

			goto restore;

		}



		if (btrfs_super_log_root(fs_info->super_copy) != 0)

		if (btrfs_super_log_root(fs_info->super_copy) != 0) {

			ret = -EINVAL;

			goto restore;

		}



		ret = btrfs_cleanup_fs_roots(fs_info);

		if (ret)