diff options
| author | Anand Jain <anand.jain@oracle.com> | 2016-12-06 12:39:38 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-12-14 15:06:36 +0100 |
| commit | 8e2bd38f2989c76d80c5b21fac3f839fcce24e4d (patch) | |
| tree | 1ff651f5e772fdfe2e0f3e1979cb5abf9e4fb4ed | |
| parent | d62902e95b9f8d54c290bcd47f7a573145479d3d (diff) | |
btrfs-progs: recursive defrag cleanup duplicate code
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | cmds-filesystem.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 96bdc40e..64b1cc41 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -1136,21 +1136,13 @@ static int cmd_filesystem_defrag(int argc, char **argv) close_file_or_dir(fd, dirstream); continue; } - if (recursive) { - if (S_ISDIR(st.st_mode)) { - ret = nftw(argv[i], defrag_callback, 10, + if (recursive && S_ISDIR(st.st_mode)) { + ret = nftw(argv[i], defrag_callback, 10, FTW_MOUNT | FTW_PHYS); - if (ret == ENOTTY) - exit(1); - /* errors are handled in the callback */ - ret = 0; - } else { - if (defrag_global_verbose) - printf("%s\n", argv[i]); - ret = do_defrag(fd, defrag_global_fancy_ioctl, - &defrag_global_range); - e = errno; - } + if (ret == ENOTTY) + exit(1); + /* errors are handled in the callback */ + ret = 0; } else { if (defrag_global_verbose) printf("%s\n", argv[i]); |