diff options
| author | smh <smh@FreeBSD.org> | 2016-01-06 20:25:41 +0000 |
|---|---|---|
| committer | smh <smh@FreeBSD.org> | 2016-01-06 20:25:41 +0000 |
| commit | 7cd33006e8ec996dff0a59414549476592e2a510 (patch) | |
| tree | 066de02ffe32c10275f472a69e96a19d24bf4c20 | |
| parent | 5627d4f7c510f894f34fdf537abacc227f13fe92 (diff) | |
| download | FreeBSD-src-7cd33006e8ec996dff0a59414549476592e2a510.zip FreeBSD-src-7cd33006e8ec996dff0a59414549476592e2a510.tar.gz | |
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
| -rw-r--r-- | sys/boot/zfs/zfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/boot/zfs/zfs.c b/sys/boot/zfs/zfs.c index 0e15ac4..fdb79bb 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); } /* |
