Date: Mon, 25 Jan 2016 10:43:44 +0000 (UTC) From: Steven Hartland <smh@FreeBSD.org> 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 Message-ID: <201601251043.u0PAhiHM050626@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601251043.u0PAhiHM050626>