diff options
author | Tom Rini <trini@konsulko.com> | 2021-01-20 16:45:21 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-01-20 16:45:43 -0500 |
commit | 83433fdab4920e206700bca33b9040c7978afc9d (patch) | |
tree | 337bc3bf628c133320b5589b5865bb3d64c05bd1 /fs/btrfs/disk-io.c | |
parent | 404bbc809da50fcf0b63566803d5061f80d93885 (diff) | |
parent | 81f562719e475b0e13ff7a0201cae19f8cc367fe (diff) |
Merge branch '2021-01-20-fs-fixes'
- Minor SquashFS, BTRFS ubifs fixes
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r-- | fs/btrfs/disk-io.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 01e7cee5201..b332ecb796f 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1030,7 +1030,6 @@ out: int close_ctree_fs_info(struct btrfs_fs_info *fs_info) { int ret; - int err = 0; free_fs_roots_tree(&fs_info->fs_root_tree); @@ -1038,9 +1037,7 @@ int close_ctree_fs_info(struct btrfs_fs_info *fs_info) ret = btrfs_close_devices(fs_info->fs_devices); btrfs_cleanup_all_caches(fs_info); btrfs_free_fs_info(fs_info); - if (!err) - err = ret; - return err; + return ret; } int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid) |