RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-02-09 06:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: recursive defrag cleanup duplicate code

Browse Source 
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain 2016-12-06 12:39:38 +08:00 committed by David Sterba
parent d62902e95b
commit 8e2bd38f29
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmds-filesystem.c
View File

@ -1136,8 +1136,7 @@ static int cmd_filesystem_defrag(int argc, char **argv)
close_file_or_dir(fd, dirstream); close_file_or_dir(fd, dirstream);
continue; continue;
} }
if (recursive) { if (recursive && S_ISDIR(st.st_mode)) {
if (S_ISDIR(st.st_mode)) {
ret = nftw(argv[i], defrag_callback, 10, ret = nftw(argv[i], defrag_callback, 10,
FTW_MOUNT | FTW_PHYS); FTW_MOUNT | FTW_PHYS);
if (ret == ENOTTY) if (ret == ENOTTY)
@ -1151,13 +1150,6 @@ static int cmd_filesystem_defrag(int argc, char **argv)
&defrag_global_range); &defrag_global_range);
e = errno; e = errno;
} }
} else {
if (defrag_global_verbose)
printf("%s\n", argv[i]);
ret = do_defrag(fd, defrag_global_fancy_ioctl,
&defrag_global_range);
e = errno;
}
close_file_or_dir(fd, dirstream); close_file_or_dir(fd, dirstream);
if (ret && e == ENOTTY && defrag_global_fancy_ioctl) { if (ret && e == ENOTTY && defrag_global_fancy_ioctl) {
error("defrag range ioctl not " error("defrag range ioctl not "