From owner-svn-src-stable@freebsd.org  Mon Jan 25 10:43:46 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1282EA4588C;
 Mon, 25 Jan 2016 10:43:46 +0000 (UTC) (envelope-from smh@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D3D0CDF7;
 Mon, 25 Jan 2016 10:43:45 +0000 (UTC) (envelope-from smh@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0PAhiOi050627;
 Mon, 25 Jan 2016 10:43:44 GMT (envelope-from smh@FreeBSD.org)
Received: (from smh@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0PAhiHM050626;
 Mon, 25 Jan 2016 10:43:44 GMT (envelope-from smh@FreeBSD.org)
Message-Id: <201601251043.u0PAhiHM050626@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: smh set sender to smh@FreeBSD.org
 using -f
From: Steven Hartland <smh@FreeBSD.org>
Date: Mon, 25 Jan 2016 10:43:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r294716 - stable/10/sys/boot/zfs
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jan 2016 10:43:46 -0000

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);
 }
 
 /*