Commit 88f06a20 authored by omni's avatar omni
Browse files

main/zfs-lts: upgrade to 2.1.5

parent 1bf19204
......@@ -40,21 +40,3 @@ Index: zfs-linux-2.0.3/module/os/linux/zfs/zfs_uio.c
} else {
b_left =
copy_from_user(p,
@@ -248,7 +254,7 @@ uio_prefaultpages(ssize_t n, struct uio
/* touch each page in this segment. */
p = iov->iov_base + skip;
while (cnt) {
- if (get_user(tmp, (uint8_t *)p))
+ if (copy_from_user(&tmp, p, 1))
return (EFAULT);
ulong_t incr = MIN(cnt, PAGESIZE);
p += incr;
@@ -256,7 +262,7 @@ uio_prefaultpages(ssize_t n, struct uio
}
/* touch the last byte in case it straddles a page. */
p--;
- if (get_user(tmp, (uint8_t *)p))
+ if (copy_from_user(&tmp, p, 1))
return (EFAULT);
}
}
......@@ -3,8 +3,8 @@
# when changing _ver we *must* bump _rel
_name=zfs
_ver=2.1.4
_rel=1
_ver=2.1.5
_rel=2
_flavor=${FLAVOR:-lts}
_kpkg=linux-$_flavor
......@@ -111,6 +111,6 @@ dev() {
}
sha512sums="
c7b57c43fc287b22905067ab022df4133d32e1a5dc335f7baf743b4ef88f64c2bf9d41318c2083230d077dd49e68f7d9e6172266e13d4b1eee29d359860f969e zfs-2.1.4.tar.gz
2643a55f9aef3f3a4e9242d4ae1377d28ae8ca9b31b2e87eb19e8f0d32ef24ba03ec39d776553fcd38b77b407696f00224c129d4f3b16f0e36b49279055d2d87 4900-ppc-get-user-workaround.patch
d9ccf1049cefa9167d25f71fbdca70092cd02368b60f09341e6489fb68dc5f89e87b026b0191f4d81181a8851449124d824a1d959d0e2fb29c8a3d624edc4f03 zfs-2.1.5.tar.gz
95e89228cacfa6594e76da1f9b9aed828532f31d584ba699c91dd5f98623d1a67379f4b88ed91841bc3cfd3bb55eea85876581847d721726f1fe9df441709696 4900-ppc-get-user-workaround.patch
"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment