| Message ID | 20171129134806.32324-1-wqu@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Nov 29, 2017 at 09:48:05PM +0800, Qu Wenruo wrote: > 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 <jeffm@suse.com> > Signed-off-by: Qu Wenruo <wqu@suse.com> 1-2 applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/convert/main.c b/convert/main.c index af2855316fee..89f9261172ca 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
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 <jeffm@suse.com> Signed-off-by: Qu Wenruo <wqu@suse.com> --- convert/main.c | 2 ++ 1 file changed, 2 insertions(+)