ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fstrim: Return EXIT_FAILURE when FTRIM ioctl fails 

commit 36c370cbf1 adds fstrim_filesystem()
that return -1 or 1 depending on the FTRIM ioctl failures.

The fstrim_filesystem() return codes should not be used as exit codes.

Reported-by: Gwendal Grignou <gwendal@chromium.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2018-04-06 12:53:18 +02:00
parent 6963338ca5
commit 7afdbb6f07
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys-utils/fstrim.c
View File

@ -241,7 +241,7 @@ static int fstrim_all(struct fstrim_range *rangetpl, int verbose)
if (cnt && cnt_err)
return MNT_EX_SOMEOK; /* some ok */
return EXIT_SUCCESS;
return MNT_EX_SUCCESS;
}
static void __attribute__((__noreturn__)) usage(void)
@ -336,14 +336,11 @@ int main(int argc, char **argv)
}
if (all)
rc = fstrim_all(&range, verbose);
else {
rc = fstrim_filesystem(path, &range, verbose);
if (rc == 1) {
warnx(_("%s: the discard operation is not supported"), path);
rc = EXIT_FAILURE;
}
}
return fstrim_all(&range, verbose); /* MNT_EX_* codes */
return rc;
rc = fstrim_filesystem(path, &range, verbose);
if (rc == 1)
warnx(_("%s: the discard operation is not supported"), path);
return rc == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}