Date: Fri, 15 Mar 2019 14:42:23 +0000 (UTC) From: Eugene Grosbein <eugen@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345184 - head/usr.sbin/trim Message-ID: <201903151442.x2FEgNpo075206@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eugen Date: Fri Mar 15 14:42:23 2019 New Revision: 345184 URL: https://svnweb.freebsd.org/changeset/base/345184 Log: trim(8): emit more user-friendly error message in verbose mode. If underlying driver provides no TRIM/UNMAP support and operation fails due to this reason, state it clearly in verbose mode (default) instead of writing standard message that may be too cryptic for a user: trim: ioctl(DIOCGDELETE) failed: nda0: Operation not supported Now it would write: trim: nda0: TRIM/UNMAP not supported by driver But still use previous format including errno value for quiet mode. Small candelete() function borrowed from diskinfo(8) code. This function was committed by Alan Somers <asomers@FreeBSD.org>, so give him some credit. Reported by: chuck Modified: head/usr.sbin/trim/trim.c Modified: head/usr.sbin/trim/trim.c ============================================================================== --- head/usr.sbin/trim/trim.c Fri Mar 15 14:19:45 2019 (r345183) +++ head/usr.sbin/trim/trim.c Fri Mar 15 14:42:23 2019 (r345184) @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2019 Eugene Grosbein <eugen@FreeBSD.org>. - * All rights reserved. + * Contains code written by Alan Somers <asomers@FreeBSD.org>. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -47,6 +47,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +static bool candelete(int fd); static off_t getsize(const char *path); static int opendev(const char *path, int flags); static int trim(const char *path, off_t offset, off_t length, bool dryrun, bool verbose); @@ -135,6 +136,19 @@ main(int argc, char **argv) return (error ? EXIT_FAILURE : EXIT_SUCCESS); } +static bool +candelete(int fd) +{ + struct diocgattr_arg arg; + + strlcpy(arg.name, "GEOM::candelete", sizeof(arg.name)); + arg.len = sizeof(arg.value.i); + if (ioctl(fd, DIOCGATTR, &arg) == 0) + return (arg.value.i != 0); + else + return (false); +} + static int opendev(const char *path, int flags) { @@ -211,9 +225,12 @@ trim(const char *path, off_t offset, off_t length, boo arg[1] = length; error = ioctl(fd, DIOCGDELETE, arg); - if (error < 0) - warn("ioctl(DIOCGDELETE) failed: %s", path); - + if (error < 0) { + if (errno == EOPNOTSUPP && verbose && !candelete(fd)) + warnx("%s: TRIM/UNMAP not supported by driver", path); + else + warn("ioctl(DIOCGDELETE) failed: %s", path); + } close(fd); return (error); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903151442.x2FEgNpo075206>