Date: Wed, 6 Jan 2016 20:25:41 +0000 (UTC) From: Steven Hartland <smh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r293269 - head/sys/boot/zfs Message-ID: <201601062025.u06KPfWS091140@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601062025.u06KPfWS091140>