From e8f9653fc04513db59b0d1438367ecee1552db9d Mon Sep 17 00:00:00 2001 From: Qu Wenruo Date: Wed, 29 Nov 2017 21:48:05 +0800 Subject: btrfs-progs: convert: Fix a bug in rollback check which overwrite return value Commit 1170ac307900 ("btrfs-progs: convert: Introduce function to check if convert image is able to be rolled back") reworked rollback check condition, by checking 1:1 mapping of each file extent. The idea itself has nothing wrong, but error handler is not implemented correctly, which over writes the return value and always try to rollback the fs even it fails to pass the check. Fix it by correctly return the error before rollback the fs. Fixes: 1170ac307900 ("btrfs-progs: convert: Introduce function to check if convert image is able to be rolled back") Reported-by: Jeff Mahoney Signed-off-by: Qu Wenruo Signed-off-by: David Sterba --- convert/main.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'convert') diff --git a/convert/main.c b/convert/main.c index af285531..89f92611 100644 --- a/convert/main.c +++ b/convert/main.c @@ -1443,6 +1443,8 @@ next: } } btrfs_release_path(&path); + if (ret) + return ret; /* * For HOLES mode (without NO_HOLES), we must ensure file extents * cover the whole range of the image -- cgit v1.2.3