From 0d4adfd33687619b524f30414eda18cd63bb0ec1 Mon Sep 17 00:00:00 2001 From: Su Yue Date: Tue, 3 Apr 2018 16:39:45 +0800 Subject: btrfs-progs: mkfs: return nozero value on thin provisioned device With mkfs.btrfs on a thin provisioned device with very small backing size and big virtual size, all code works well in mkfs.btrfs until close_ctree() is called. close_ctree() fails to sync device due to small backing size while closing devices. However, mkfs returns 0 in such situation which causes failure of fstests generic/405. So, let mkfs returns nonzero value if previous steps succeeded but close_ctree() failed. Then fstests generic/405 passes now. Signed-off-by: Su Yue Reviewed-by: Qu Wenruo Signed-off-by: David Sterba --- mkfs/main.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mkfs') diff --git a/mkfs/main.c b/mkfs/main.c index b65b18dd..0337993c 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -1295,6 +1295,12 @@ out: } } + if (!ret && close_ret) { + ret = close_ret; + error("failed to close ctree, the filesystem may be inconsistent: %d", + ret); + } + btrfs_close_all_devices(); free(label); -- cgit v1.2.3