* [PATCH 1/2] btrfs-progs: fi defrag: clean up duplicate code if find errors
@ 2017-11-07 2:24 Su Yue
2017-11-07 2:24 ` [PATCH 2/2] btrfs-progs: fi defrag: extend -c to drop nocompress flag on files Su Yue
2017-11-27 19:14 ` [PATCH 1/2] btrfs-progs: fi defrag: clean up duplicate code if find errors David Sterba
0 siblings, 2 replies; 3+ messages in thread
From: Su Yue @ 2017-11-07 2:24 UTC (permalink / raw)
To: linux-btrfs
In function cmd_filesystem_defrag(), lines of code for error handling
are duplicate and hard to expand in further.
Create a jump label for errors.
Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com>
---
cmds-filesystem.c | 46 +++++++++++++++++++++++++---------------------
1 file changed, 25 insertions(+), 21 deletions(-)
diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index 7728430f16a1..0893a44f28fe 100644
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -1029,29 +1029,27 @@ static int cmd_filesystem_defrag(int argc, char **argv)
if (fd < 0) {
error("cannot open %s: %s", argv[i],
strerror(errno));
- defrag_global_errors++;
- close_file_or_dir(fd, dirstream);
- continue;
+ ret = fd;
+ goto next;
}
- if (fstat(fd, &st)) {
+
+ ret = fstat(fd, &st);
+ if (ret) {
error("failed to stat %s: %s",
argv[i], strerror(errno));
- defrag_global_errors++;
- close_file_or_dir(fd, dirstream);
- continue;
+ goto next;
}
if (!(S_ISDIR(st.st_mode) || S_ISREG(st.st_mode))) {
error("%s is not a directory or a regular file",
argv[i]);
- defrag_global_errors++;
- close_file_or_dir(fd, dirstream);
- continue;
+ ret = -EINVAL;
+ goto next;
}
if (recursive && S_ISDIR(st.st_mode)) {
ret = nftw(argv[i], defrag_callback, 10,
FTW_MOUNT | FTW_PHYS);
if (ret == ENOTTY)
- exit(1);
+ break;
/* errors are handled in the callback */
ret = 0;
} else {
@@ -1060,20 +1058,26 @@ static int cmd_filesystem_defrag(int argc, char **argv)
ret = ioctl(fd, BTRFS_IOC_DEFRAG_RANGE,
&defrag_global_range);
defrag_err = errno;
- }
- close_file_or_dir(fd, dirstream);
- if (ret && defrag_err == ENOTTY) {
- error(
+ if (ret && defrag_err == ENOTTY) {
+ error(
"defrag range ioctl not supported in this kernel version, 2.6.33 and newer is required");
- defrag_global_errors++;
- break;
+ defrag_global_errors++;
+ close_file_or_dir(fd, dirstream);
+ break;
+ }
+
+ if (ret) {
+ error("defrag failed on %s: %s", argv[i],
+ strerror(defrag_err));
+ goto next;
+ }
}
- if (ret) {
- error("defrag failed on %s: %s", argv[i],
- strerror(defrag_err));
+next:
+ if (ret)
defrag_global_errors++;
- }
+ close_file_or_dir(fd, dirstream);
}
+
if (defrag_global_errors)
fprintf(stderr, "total %d failures\n", defrag_global_errors);
--
2.15.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] btrfs-progs: fi defrag: extend -c to drop nocompress flag on files
2017-11-07 2:24 [PATCH 1/2] btrfs-progs: fi defrag: clean up duplicate code if find errors Su Yue
@ 2017-11-07 2:24 ` Su Yue
2017-11-27 19:14 ` [PATCH 1/2] btrfs-progs: fi defrag: clean up duplicate code if find errors David Sterba
1 sibling, 0 replies; 3+ messages in thread
From: Su Yue @ 2017-11-07 2:24 UTC (permalink / raw)
To: linux-btrfs
Now, files which have nocompress flag also will be defraged
with compression. However, nocompress flag is still existed
and have to be cleared manually.
So add an option '--clear-nocompress' to extend -c to drop
nocompress flag after defragement.
Suggested-by: David Sterba <dsterba@suse.com>
Suggested-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com>
---
cmds-filesystem.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 65 insertions(+), 3 deletions(-)
diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index 0893a44f28fe..86de86a3f416 100644
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -27,6 +27,7 @@
#include <mntent.h>
#include <linux/limits.h>
#include <getopt.h>
+#include <linux/fs.h>
#include "kerncompat.h"
#include "ctree.h"
@@ -867,6 +868,8 @@ static const char * const cmd_filesystem_defrag_usage[] = {
"-l len defragment only up to len bytes",
"-t size target extent size hint (default: 32M)",
"",
+ "--compress-force clear nocompress flag on files after defragment, only work with option -c",
+ "",
"Warning: most Linux kernels will break up the ref-links of COW data",
"(e.g., files copied with 'cp --reflink', snapshots) which may cause",
"considerable increase of space usage. See btrfs-filesystem(8) for",
@@ -874,11 +877,41 @@ static const char * const cmd_filesystem_defrag_usage[] = {
NULL
};
+static int clear_nocompress_flag(int fd)
+{
+ unsigned int flags;
+ int ret = 0;
+
+ ret = ioctl(fd, FS_IOC_GETFLAGS, &flags);
+ if (ret < 0) {
+ ret = -errno;
+ error("failed to get flags: %s", strerror(-ret));
+ goto out;
+ }
+
+ if (!(flags & FS_NOCOMP_FL)) {
+ ret = 0;
+ goto out;
+ }
+ flags &= ~FS_NOCOMP_FL;
+ ret = ioctl(fd, FS_IOC_SETFLAGS, &flags);
+ if (ret < 0) {
+ ret = -errno;
+ error("failed to set flags: %s", strerror(-ret));
+ goto out;
+ }
+
+ ret = 0;
+out:
+ return ret;
+}
+
static struct btrfs_ioctl_defrag_range_args defrag_global_range;
static int defrag_global_verbose;
static int defrag_global_errors;
+static int defrag_global_clear_nocompress;
static int defrag_callback(const char *fpath, const struct stat *sb,
- int typeflag, struct FTW *ftwbuf)
+ int typeflag, struct FTW *ftwbuf)
{
int ret = 0;
int err = 0;
@@ -904,6 +937,14 @@ static int defrag_callback(const char *fpath, const struct stat *sb,
err = errno;
goto error;
}
+
+ if (defrag_global_clear_nocompress) {
+ ret = clear_nocompress_flag(fd);
+ if (ret) {
+ err = -ret;
+ goto error;
+ }
+ }
}
return 0;
@@ -926,6 +967,12 @@ static int cmd_filesystem_defrag(int argc, char **argv)
int compress_type = BTRFS_COMPRESS_NONE;
DIR *dirstream;
+ enum { GETOPT_VAL_CLEAR_NOCOMPRESS = 257};
+ static const struct option long_options[] = {
+ { "clear-nocompress", no_argument, NULL,
+ GETOPT_VAL_CLEAR_NOCOMPRESS},
+ { NULL, 0, NULL, 0}
+ };
/*
* Kernel has a different default (256K) that is supposed to be safe,
* but it does not defragment very well. The 32M will likely lead to
@@ -937,8 +984,10 @@ static int cmd_filesystem_defrag(int argc, char **argv)
defrag_global_errors = 0;
defrag_global_verbose = 0;
defrag_global_errors = 0;
+ defrag_global_clear_nocompress = 0;
while(1) {
- int c = getopt(argc, argv, "vrc::fs:l:t:");
+ int c = getopt_long(argc, argv, "vrc::fs:l:t:", long_options,
+ NULL);
if (c < 0)
break;
@@ -972,6 +1021,9 @@ static int cmd_filesystem_defrag(int argc, char **argv)
case 'r':
recursive = 1;
break;
+ case GETOPT_VAL_CLEAR_NOCOMPRESS:
+ defrag_global_clear_nocompress = 1;
+ break;
default:
usage(cmd_filesystem_defrag_usage);
}
@@ -987,6 +1039,8 @@ static int cmd_filesystem_defrag(int argc, char **argv)
if (compress_type) {
defrag_global_range.flags |= BTRFS_DEFRAG_RANGE_COMPRESS;
defrag_global_range.compress_type = compress_type;
+ } else if (defrag_global_clear_nocompress) {
+ warning("Option --clear-nocompress only works for -c");
}
if (flush)
defrag_global_range.flags |= BTRFS_DEFRAG_RANGE_START_IO;
@@ -1065,12 +1119,20 @@ static int cmd_filesystem_defrag(int argc, char **argv)
close_file_or_dir(fd, dirstream);
break;
}
-
if (ret) {
error("defrag failed on %s: %s", argv[i],
strerror(defrag_err));
goto next;
}
+
+ if (defrag_global_clear_nocompress)
+ ret = clear_nocompress_flag(fd);
+ if (ret) {
+ error(
+ "failed to drop nocompress flag on %s: %s",
+ argv[i], strerror(-ret));
+ goto next;
+ }
}
next:
if (ret)
--
2.15.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] btrfs-progs: fi defrag: clean up duplicate code if find errors
2017-11-07 2:24 [PATCH 1/2] btrfs-progs: fi defrag: clean up duplicate code if find errors Su Yue
2017-11-07 2:24 ` [PATCH 2/2] btrfs-progs: fi defrag: extend -c to drop nocompress flag on files Su Yue
@ 2017-11-27 19:14 ` David Sterba
1 sibling, 0 replies; 3+ messages in thread
From: David Sterba @ 2017-11-27 19:14 UTC (permalink / raw)
To: Su Yue; +Cc: linux-btrfs
On Tue, Nov 07, 2017 at 10:24:30AM +0800, Su Yue wrote:
> In function cmd_filesystem_defrag(), lines of code for error handling
> are duplicate and hard to expand in further.
>
> Create a jump label for errors.
>
> Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com>
> ---
> cmds-filesystem.c | 46 +++++++++++++++++++++++++---------------------
> 1 file changed, 25 insertions(+), 21 deletions(-)
>
> diff --git a/cmds-filesystem.c b/cmds-filesystem.c
> index 7728430f16a1..0893a44f28fe 100644
> --- a/cmds-filesystem.c
> +++ b/cmds-filesystem.c
> @@ -1029,29 +1029,27 @@ static int cmd_filesystem_defrag(int argc, char **argv)
> if (fd < 0) {
> error("cannot open %s: %s", argv[i],
> strerror(errno));
> - defrag_global_errors++;
> - close_file_or_dir(fd, dirstream);
> - continue;
> + ret = fd;
The fd will be -1, we might need to save the last error, though it's not
directly used (yet).
> + goto next;
> }
> - if (fstat(fd, &st)) {
> +
> + ret = fstat(fd, &st);
> + if (ret) {
> error("failed to stat %s: %s",
> argv[i], strerror(errno));
> - defrag_global_errors++;
> - close_file_or_dir(fd, dirstream);
> - continue;
> + goto next;
Similar here.
> }
> if (!(S_ISDIR(st.st_mode) || S_ISREG(st.st_mode))) {
> error("%s is not a directory or a regular file",
> argv[i]);
> - defrag_global_errors++;
> - close_file_or_dir(fd, dirstream);
> - continue;
> + ret = -EINVAL;
So it's consistent with that one.
> + goto next;
> }
> if (recursive && S_ISDIR(st.st_mode)) {
> ret = nftw(argv[i], defrag_callback, 10,
> FTW_MOUNT | FTW_PHYS);
> if (ret == ENOTTY)
> - exit(1);
> + break;
Please split this change, it changes the logic and should be properly
described in the changelog.
Otherwise ok.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-27 19:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-07 2:24 [PATCH 1/2] btrfs-progs: fi defrag: clean up duplicate code if find errors Su Yue
2017-11-07 2:24 ` [PATCH 2/2] btrfs-progs: fi defrag: extend -c to drop nocompress flag on files Su Yue
2017-11-27 19:14 ` [PATCH 1/2] btrfs-progs: fi defrag: clean up duplicate code if find errors David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).