diff options
| author | Zhao Lei <zhaolei@cn.fujitsu.com> | 2015-08-24 16:45:03 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2015-08-31 19:25:13 +0200 |
| commit | ec1fc69d3945f67684a2c15969dfb309ed967168 (patch) | |
| tree | 478a9c43eec1586aca8cf9c04ae86c9ec4a047c6 /cmds-replace.c | |
| parent | b0f760c91aa9de9a853545f36dc063f6ef5e9008 (diff) | |
| download | btrfs-progs-ec1fc69d3945f67684a2c15969dfb309ed967168.tar.gz | |
btrfs-progs: close all fs_devices before exit in some commands
mkfs creates more than one fs_devices in fs_uuids.
1: one is for file system being created
2: others are created in test_dev_for_mkfs in order to check mount point
test_dev_for_mkfs()-> ... -> btrfs_scan_one_device()
Current code only closes 1, and this patch also closes in case 2.
Similar problem exist in other tools, eg.::
cmd-check.c: the function is:
cmd_check()->check_mounted()-> ... -> btrfs_scan_one_device()
...
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'cmds-replace.c')
| -rw-r--r-- | cmds-replace.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmds-replace.c b/cmds-replace.c index c777f1c..a980305 100644 --- a/cmds-replace.c +++ b/cmds-replace.c @@ -330,6 +330,7 @@ static int cmd_replace_start(int argc, char **argv) } } close_file_or_dir(fdmnt, dirstream); + btrfs_close_all_devices(); return 0; leave_with_error: @@ -339,6 +340,7 @@ leave_with_error: close(fdmnt); if (fddstdev != -1) close(fddstdev); + btrfs_close_all_devices(); return 1; } |