summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorsmh <smh@FreeBSD.org>2016-01-25 10:43:44 +0000
committersmh <smh@FreeBSD.org>2016-01-25 10:43:44 +0000
commitc01d1bb4ae3824fd84ced19e50713ffe024c22e5 (patch)
tree8aae075e6c1268ec64a7c05befdeb72bb7edd761 /sys/boot
parent16322e7a2a2da1f47f427d0366e0b62c4f668195 (diff)
downloadFreeBSD-src-c01d1bb4ae3824fd84ced19e50713ffe024c22e5.zip
FreeBSD-src-c01d1bb4ae3824fd84ced19e50713ffe024c22e5.tar.gz
MFC r293269:
Fix return from zfs_probe_dev Sponsored by: Multiplay
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/zfs/zfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/boot/zfs/zfs.c b/sys/boot/zfs/zfs.c
index 0679a57..c339b2d 100644
--- a/sys/boot/zfs/zfs.c
+++ b/sys/boot/zfs/zfs.c
@@ -154,7 +154,7 @@ zfs_read(struct open_file *f, void *start, size_t size, size_t *resid /* out */)
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, uint64_t *pool_guid)
}
}
close(pa.fd);
- return (0);
+ return (ret);
}
/*
OpenPOWER on IntegriCloud