svn commit: r293269 - head/sys/boot/zfs

[Steven Hartland]

Author: smh
Date: Wed Jan  6 20:25:41 2016
New Revision: 293269
URL: https://svnweb.freebsd.org/changeset/base/293269

Log:
  Fix return from zfs_probe_dev
  
  Ensure zfs_probe_dev returns the correct value.
  
  Also fix a style(9) trailing whitespace issue while here.
  
  MFC after:	2 weeks
  X-MFC-With:	r293268
  Sponsored by:	Multiplay

Modified:
  head/sys/boot/zfs/zfs.c

Modified: head/sys/boot/zfs/zfs.c
==============================================================================
--- head/sys/boot/zfs/zfs.c	Wed Jan  6 20:22:28 2016	(r293268)
+++ head/sys/boot/zfs/zfs.c	Wed Jan  6 20:25:41 2016	(r293269)
@@ -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);
 }
 
 /*