| Message ID | 20210309171104.30821-1-mdoucha@suse.cz |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [1/2] Add FS quota availability check functions | expand |
Hi Martin,
Reviewed-by: Petr Vorel <pvorel@suse.cz>
nice, thanks!
Kind regards,
Petr
Hi Martin, > +int tst_check_quota_support(const char *device, int format, > + const char *quotafile) > +{ > + TEST(quotactl(QCMD(Q_QUOTAON, USRQUOTA), device, format, quotafile)); Actually, there is a warning: tst_supported_fs_types.c: In function ‘tst_check_quota_support’: tst_supported_fs_types.c:117:59: warning: passing argument 4 of ‘quotactl’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] 117 | TEST(quotactl(QCMD(Q_QUOTAON, USRQUOTA), device, format, quotafile)); Would you prefer to cast to char *, or just change function parameter to char *? Kind regards, Petr > + > + /* Not supported */ > + if (TST_RET == -1 && TST_ERR == ESRCH) > + return 0; > + > + /* Broken */ > + if (TST_RET) > + return -1; > + > + quotactl(QCMD(Q_QUOTAOFF, USRQUOTA), device, 0, 0); > + return 1; > +}
On 12. 03. 21 11:28, Petr Vorel wrote: > Hi Martin, > >> +int tst_check_quota_support(const char *device, int format, >> + const char *quotafile) >> +{ >> + TEST(quotactl(QCMD(Q_QUOTAON, USRQUOTA), device, format, quotafile)); > Actually, there is a warning: > tst_supported_fs_types.c: In function ‘tst_check_quota_support’: > tst_supported_fs_types.c:117:59: warning: passing argument 4 of ‘quotactl’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] > 117 | TEST(quotactl(QCMD(Q_QUOTAON, USRQUOTA), device, format, quotafile)); > > Would you prefer to cast to char *, or just change function parameter to char *? Thanks for catching this. Passing string literals to the function directly is technically wrong so I'll drop the const and fix the tests to allocate a buffer for quotafile paths. I'll resubmit on Monday.
Hi Martin, > >> + TEST(quotactl(QCMD(Q_QUOTAON, USRQUOTA), device, format, quotafile)); > > Actually, there is a warning: > > tst_supported_fs_types.c: In function ‘tst_check_quota_support’: > > tst_supported_fs_types.c:117:59: warning: passing argument 4 of ‘quotactl’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] > > 117 | TEST(quotactl(QCMD(Q_QUOTAON, USRQUOTA), device, format, quotafile)); > > Would you prefer to cast to char *, or just change function parameter to char *? > Thanks for catching this. Passing string literals to the function > directly is technically wrong so I'll drop the const and fix the tests > to allocate a buffer for quotafile paths. I'll resubmit on Monday. Thanks a lot! Kind regards, Petr
diff --git a/include/tst_fs.h b/include/tst_fs.h index 4f7dd68d2..acf31d0e1 100644 --- a/include/tst_fs.h +++ b/include/tst_fs.h @@ -180,6 +180,22 @@ int tst_fs_is_supported(const char *fs_type, int flags); */ const char **tst_get_supported_fs_types(int flags); +/* + * Check whether device supports FS quotas. Negative return value means that + * quotas appear to be broken. + */ +int tst_check_quota_support(const char *device, int format, + const char *quotafile); + +/* + * Check for quota support and terminate the test with appropriate exit status + * if quotas are not supported or broken. + */ +#define tst_require_quota_support(dev, fmt, qfile) \ + tst_require_quota_support_(__FILE__, __LINE__, (dev), (fmt), (qfile)) +void tst_require_quota_support_(const char *file, const int lineno, + const char *device, int format, const char *quotafile); + /* * Creates and writes to files on given path until write fails with ENOSPC */ diff --git a/lib/tst_supported_fs_types.c b/lib/tst_supported_fs_types.c index 00ede549d..d9d310fd7 100644 --- a/lib/tst_supported_fs_types.c +++ b/lib/tst_supported_fs_types.c @@ -8,6 +8,7 @@ #include <stdlib.h> #include <sys/mount.h> #include <sys/wait.h> +#include <sys/quota.h> #define TST_NO_DEFAULT_MAIN #include "tst_test.h" @@ -109,3 +110,34 @@ const char **tst_get_supported_fs_types(int flags) return fs_types; } + +int tst_check_quota_support(const char *device, int format, + const char *quotafile) +{ + TEST(quotactl(QCMD(Q_QUOTAON, USRQUOTA), device, format, quotafile)); + + /* Not supported */ + if (TST_RET == -1 && TST_ERR == ESRCH) + return 0; + + /* Broken */ + if (TST_RET) + return -1; + + quotactl(QCMD(Q_QUOTAOFF, USRQUOTA), device, 0, 0); + return 1; +} + +void tst_require_quota_support_(const char *file, const int lineno, + const char *device, int format, const char *quotafile) +{ + int status = tst_check_quota_support(device, format, quotafile); + + if (!status) { + tst_brk_(file, lineno, TCONF, + "Kernel or device does not support FS quotas"); + } + + if (status < 0) + tst_brk_(file, lineno, TBROK|TTERRNO, "FS quotas are broken"); +}
Signed-off-by: Martin Doucha <mdoucha@suse.cz> --- include/tst_fs.h | 16 ++++++++++++++++ lib/tst_supported_fs_types.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+)