marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: mkfs: check the status of file at mkfs 

Currently, only the status of block devices is checked at mkfs,
but we should also check for regular files whether they are already
formatted or mounted to prevent overwrite accidentally.

Device status is checked by test_dev_for_mkfs().
The part which is not related to block device is split from this
and used for both block device and regular file.

Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Misono, Tomohiro 2017-11-24 14:21:15 +09:00 committed by David Sterba
parent dc06cda3d6
commit e460ccd6d1
3 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
mkfs/common.c
View File

@ -632,23 +632,9 @@ int test_dev_for_mkfs(const char *file, int force_overwrite)
error("%s is a swap device", file);
return 1;
}
if (!force_overwrite) {
if (check_overwrite(file)) {
error("use the -f option to force overwrite of %s",
file);
return 1;
}
}
ret = check_mounted(file);
if (ret < 0) {
error("cannot check mount status of %s: %s", file,
strerror(-ret));
ret = test_status_for_mkfs(file, force_overwrite);
if (ret)
return 1;
}
if (ret == 1) {
error("%s is mounted", file);
return 1;
}
/* check if the device is busy */
fd = open(file, O_RDWR|O_EXCL);
if (fd < 0) {
@ -669,6 +655,34 @@ int test_dev_for_mkfs(const char *file, int force_overwrite)
return 0;
}
/*
* check if the file (device) is formatted or mounted
*/
int test_status_for_mkfs(const char *file, bool force_overwrite)
{
int ret;
if (!force_overwrite) {
if (check_overwrite(file)) {
error("use the -f option to force overwrite of %s",
file);
return 1;
}
}
ret = check_mounted(file);
if (ret < 0) {
error("cannot check mount status of %s: %s", file,
strerror(-ret));
return 1;
}
if (ret == 1) {
error("%s is mounted", file);
return 1;
}
return 0;
}
int is_vol_small(const char *file)
{
int fd = -1;

1
mkfs/common.h
View File

@ -72,6 +72,7 @@ int test_minimum_size(const char *file, u64 min_dev_size);
int is_vol_small(const char *file);
int test_num_disk_vs_raid(u64 metadata_profile, u64 data_profile,
u64 dev_cnt, int mixed, int ssd);
int test_status_for_mkfs(const char *file, bool force_overwrite);
int test_dev_for_mkfs(const char *file, int force_overwrite);
#endif

8
mkfs/main.c
View File

@ -1598,8 +1598,12 @@ int main(int argc, char **argv)
while (dev_cnt-- > 0) {
file = argv[optind++];
if (is_block_device(file) == 1)
if (test_dev_for_mkfs(file, force_overwrite))
goto error;
ret = test_dev_for_mkfs(file, force_overwrite);
else
ret = test_status_for_mkfs(file, force_overwrite);
if (ret)
goto error;
}
optind = saved_optind;