diff options
| author | Zhao Lei <zhaolei@cn.fujitsu.com> | 2015-10-26 18:28:19 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2015-11-02 09:35:07 +0100 |
| commit | da34dbd14936a4c6183be14b7db09f0d6e49cf09 (patch) | |
| tree | 99913ee45b3b13e48eff2d321811d60454e54b42 | |
| parent | 30fd6f2e92695c355c8f76b8887cd4fade60cdac (diff) | |
btrfs-progs: Remove all btrfs_close_all_devices in sub-command
Since we have btrfs_close_all_devices() in btrfs's main entrance,
it is not necessary to call btrfs_close_all_devices() separately
in each sub-command.
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | cmds-check.c | 1 | ||||
| -rw-r--r-- | cmds-device.c | 3 | ||||
| -rw-r--r-- | cmds-replace.c | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/cmds-check.c b/cmds-check.c index 4040f7ea..fd661d98 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -9735,7 +9735,6 @@ out: free_root_recs_tree(&root_cache); close_out: close_ctree(root); - btrfs_close_all_devices(); err_out: if (ctx.progress_enabled) task_deinit(ctx.info); diff --git a/cmds-device.c b/cmds-device.c index e461aa12..c2f3a408 100644 --- a/cmds-device.c +++ b/cmds-device.c @@ -138,7 +138,6 @@ static int cmd_device_add(int argc, char **argv) error_out: close_file_or_dir(fdmnt, dirstream); - btrfs_close_all_devices(); return !!ret; } @@ -287,7 +286,6 @@ static int cmd_device_scan(int argc, char **argv) } out: - btrfs_close_all_devices(); return !!ret; } @@ -456,7 +454,6 @@ static int cmd_device_stats(int argc, char **argv) out: free(di_args); close_file_or_dir(fdmnt, dirstream); - btrfs_close_all_devices(); return err; } diff --git a/cmds-replace.c b/cmds-replace.c index 4e0e9472..9ba256d3 100644 --- a/cmds-replace.c +++ b/cmds-replace.c @@ -309,7 +309,6 @@ static int cmd_replace_start(int argc, char **argv) } } close_file_or_dir(fdmnt, dirstream); - btrfs_close_all_devices(); return 0; leave_with_error: @@ -319,7 +318,6 @@ leave_with_error: close(fdmnt); if (fddstdev != -1) close(fddstdev); - btrfs_close_all_devices(); return 1; } |