| Message ID | 105e3aa192a47f3936c2ac47ad8d673745cccaea.1488560489.git.osandov@fb.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
At 03/04/2017 01:02 AM, Omar Sandoval wrote: > From: Omar Sandoval <osandov@fb.com> > > If the final fsync() on the Btrfs device fails, we just swallow the > error and don't alert the user in any way. This was uncovered by xfstest > generic/405, which checks that mkfs fails when it encounters EIO. > > Signed-off-by: Omar Sandoval <osandov@fb.com> Please ignore my comment on v1 patch, didn't see the v2 one. Looks good to me. Reviewed-by: Qu Wenruo <quwenruo@cn.fujitsu.com> Thanks, Qu > --- > Changes from v1: return -errno instead of -1 > > disk-io.c | 4 ++-- > volumes.c | 9 +++++++-- > 2 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/disk-io.c b/disk-io.c > index 2a94d4fc..48fb3c6b 100644 > --- a/disk-io.c > +++ b/disk-io.c > @@ -1817,10 +1817,10 @@ int close_ctree_fs_info(struct btrfs_fs_info *fs_info) > free_fs_roots_tree(&fs_info->fs_root_tree); > > btrfs_release_all_roots(fs_info); > - btrfs_close_devices(fs_info->fs_devices); > + ret = btrfs_close_devices(fs_info->fs_devices); > btrfs_cleanup_all_caches(fs_info); > btrfs_free_fs_info(fs_info); > - return 0; > + return ret; > } > > int clean_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root, > diff --git a/volumes.c b/volumes.c > index a0a85edd..f7d82d51 100644 > --- a/volumes.c > +++ b/volumes.c > @@ -160,6 +160,7 @@ int btrfs_close_devices(struct btrfs_fs_devices *fs_devices) > { > struct btrfs_fs_devices *seed_devices; > struct btrfs_device *device; > + int ret = 0; > > again: > if (!fs_devices) > @@ -168,7 +169,11 @@ again: > device = list_entry(fs_devices->devices.next, > struct btrfs_device, dev_list); > if (device->fd != -1) { > - fsync(device->fd); > + if (fsync(device->fd) == -1) { > + warning("fsync on device %llu failed: %s", > + device->devid, strerror(errno)); > + ret = -errno; > + } > if (posix_fadvise(device->fd, 0, 0, POSIX_FADV_DONTNEED)) > fprintf(stderr, "Warning, could not drop caches\n"); > close(device->fd); > @@ -197,7 +202,7 @@ again: > free(fs_devices); > } > > - return 0; > + return ret; > } > > void btrfs_close_all_devices(void) > -- 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
On Mon, Mar 06, 2017 at 08:42:01AM +0800, Qu Wenruo wrote: > > > At 03/04/2017 01:02 AM, Omar Sandoval wrote: > > From: Omar Sandoval <osandov@fb.com> > > > > If the final fsync() on the Btrfs device fails, we just swallow the > > error and don't alert the user in any way. This was uncovered by xfstest > > generic/405, which checks that mkfs fails when it encounters EIO. > > > > Signed-off-by: Omar Sandoval <osandov@fb.com> > > Please ignore my comment on v1 patch, didn't see the v2 one. > > Looks good to me. > > Reviewed-by: Qu Wenruo <quwenruo@cn.fujitsu.com> 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/disk-io.c b/disk-io.c index 2a94d4fc..48fb3c6b 100644 --- a/disk-io.c +++ b/disk-io.c @@ -1817,10 +1817,10 @@ int close_ctree_fs_info(struct btrfs_fs_info *fs_info) free_fs_roots_tree(&fs_info->fs_root_tree); btrfs_release_all_roots(fs_info); - btrfs_close_devices(fs_info->fs_devices); + ret = btrfs_close_devices(fs_info->fs_devices); btrfs_cleanup_all_caches(fs_info); btrfs_free_fs_info(fs_info); - return 0; + return ret; } int clean_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root, diff --git a/volumes.c b/volumes.c index a0a85edd..f7d82d51 100644 --- a/volumes.c +++ b/volumes.c @@ -160,6 +160,7 @@ int btrfs_close_devices(struct btrfs_fs_devices *fs_devices) { struct btrfs_fs_devices *seed_devices; struct btrfs_device *device; + int ret = 0; again: if (!fs_devices) @@ -168,7 +169,11 @@ again: device = list_entry(fs_devices->devices.next, struct btrfs_device, dev_list); if (device->fd != -1) { - fsync(device->fd); + if (fsync(device->fd) == -1) { + warning("fsync on device %llu failed: %s", + device->devid, strerror(errno)); + ret = -errno; + } if (posix_fadvise(device->fd, 0, 0, POSIX_FADV_DONTNEED)) fprintf(stderr, "Warning, could not drop caches\n"); close(device->fd); @@ -197,7 +202,7 @@ again: free(fs_devices); } - return 0; + return ret; } void btrfs_close_all_devices(void)