Author: smh
Date: Sat May  3 02:30:01 2014
New Revision: 265253
URL: http://svnweb.freebsd.org/changeset/base/265253

Log:
  Don't treat TRIM requests returning ENOTSUP as an unexpected error.
  
  MFC after:    1 month
  X-MFC-With:   r265152

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c   Sat May  3 
00:13:45 2014        (r265252)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c   Sat May  3 
02:30:01 2014        (r265253)
@@ -2674,7 +2674,10 @@ zio_vdev_io_done(zio_t **ziop)
                        zio->io_error = zio_handle_label_injection(zio, EIO);
 
                if (zio->io_error) {
-                       if (!vdev_accessible(vd, zio)) {
+                       if (zio->io_error == ENOTSUP &&
+                           zio->io_type == ZIO_TYPE_FREE) {
+                               /* Not all devices support TRIM. */
+                       } else if (!vdev_accessible(vd, zio)) {
                                zio->io_error = SET_ERROR(ENXIO);
                        } else {
                                unexpected_error = B_TRUE;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to