Author: smh
Date: Tue Sep 16 17:47:13 2014
New Revision: 271683
URL: http://svnweb.freebsd.org/changeset/base/271683

Log:
  MFC 265253:
  Don't treat TRIM requests returning ENOTSUP as an unexpected error
  
  Approved by:  re (gjb)
  Sponsored by: Multiplay

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c      Tue Sep 
16 17:42:37 2014        (r271682)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c      Tue Sep 
16 17:47:13 2014        (r271683)
@@ -2738,7 +2738,10 @@ zio_vdev_io_done(zio_t *zio)
                        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-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to