svn commit: r294716 - stable/10/sys/boot/zfs

[Steven Hartland]

Author: smh
Date: Mon Jan 25 10:43:44 2016
New Revision: 294716
URL: https://svnweb.freebsd.org/changeset/base/294716

Log:
  MFC r293269:
  
  Fix return from zfs_probe_dev
  
  Sponsored by:	Multiplay

Modified:
  stable/10/sys/boot/zfs/zfs.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/zfs/zfs.c
==============================================================================
--- stable/10/sys/boot/zfs/zfs.c	Mon Jan 25 10:41:23 2016	(r294715)
+++ stable/10/sys/boot/zfs/zfs.c	Mon Jan 25 10:43:44 2016	(r294716)
@@ -154,7 +154,7 @@ zfs_read(struct open_file *f, void *star
 	n = size;
 	if (fp->f_seekp + n > sb.st_size)
 		n = sb.st_size - fp->f_seekp;
-	
+
 	rc = dnode_read(spa, &fp->f_dnode, fp->f_seekp, start, n);
 	if (rc)
 		return (rc);
@@ -507,7 +507,7 @@ zfs_probe_dev(const char *devname, uint6
 		}
 	}
 	close(pa.fd);
-	return (0);
+	return (ret);
 }
 
 /*