Skip non-regular files in recursive defrag
PATCH 1/1 Skip non-regular files in recursive defrag
--- cmds-filesystem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
cmds-filesystem.c +1 -1
@@ -646,7 +646,7 @@ static int defrag_callback(const char *fpath, const struct stat *sb,int e =0 ;int fd =0 ; -if (typeflag ==FTW_F ) { +if ((typeflag ==FTW_F ) &&S_ISREG (sb->st_mode)) {if (defrag_global_verbose)printf ("%s\n" , fpath); fd =open (fpath,O_RDWR );
Signature · 1 line
1.8.5.2
Quoted 9 lines · Pascal VITOUX
--- cmds-filesystem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)cmds-filesystem.c +0
-0
cmds-filesystem.c static int defrag_callback(const char *fpath, const struct stat *sb, · line 649
Quoted 5 lines
cmds-filesystem.c +1
-1@@ -646,7 +646,7 @@ static int defrag_callback(const char *fpath, const struct stat *sb,int e =0 ;int fd =0 ; -if (typeflag ==FTW_F ) { +if ((typeflag ==FTW_F ) &&S_ISREG (sb->st_mode)) {
The ftw(3) documentation states that FTW_F gets the regular files, do you have a reproducer whre this does not work as expected?
I think the check could be placed into cmd_defrag, there's a st_mode check for directories already. Defragmenting makes most sense for regular files (though there's the option to defrag portions of the metadata b-trees), so it's fine to handle just directories and regular files in userspace.
If you're going to resend the patch, please add 'btrfs-progs: ' string to the subject, write a short changlog and add your Signed-off-by line.
thanks,
david
Quoted 14 lines · David Sterba
Quoted 12 lines · Pascal VITOUX
--- cmds-filesystem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)cmds-filesystem.c +0
-0@@ -646,7 +646,7 @@ static int defrag_callback(const char *fpath, const struct stat *sb,int e =0 ;int fd =0 ;
Quoted 5 lines
cmds-filesystem.c static int defrag_callback(const char *fpath, const struct stat *sb, · line 649
Quoted 2 lines
cmds-filesystem.c +1
-1-if (typeflag ==FTW_F ) { +if ((typeflag ==FTW_F ) &&S_ISREG (sb->st_mode)) {The ftw(3) documentation states that
FTW_Fgets the regular files, do you have a reproducer whre this does not work as expected?
Yes, this can be tested with the example code provided in ftw(3) and compiled with glibc 2.18.
In fact, the ftw(3) page also states in the NOTES part that, under Linux, FTW_F is used for all objects that are not a directory. Some libc versions are specified ( libc4, libc5 and glic 2.0.6 ) but it's still true in glibc 2.18
The ftw's man page is less precise than the libc manual, as you can
see here : http://www.gnu.org/software/libc/manual/html_node/Working-with-Directory-Trees.html
Quoted 5 lines
I think the check could be placed into
cmd_defrag, there's ast_modecheck for directories already. Defragmenting makes most sense for regular files (though there's the option to defrag portions of the metadata b-trees), so it's fine to handle just directories and regular files in userspace.
I think so, too. And for a single file defrag the check should return to the user an explicit error message instead of the 'defrag range ioctl not supported' error.
Quoted 5 lines
If you're going to resend the patch, please add 'btrfs-progs: ' string to the subject, write a short changlog and add your Signed-off-by line.
thanks,
david
Ok, thanks for these instructions. I will resend it soon.
Pascal.