aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/openzfs/module
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2021-04-26 01:05:13 +0000
committerMartin Matuska <mm@FreeBSD.org>2021-04-26 01:05:13 +0000
commit4b84b4cca472e482bc22d5e5c7928be5a1393c84 (patch)
treef39fc5f34e4f5a53cceacc021cf6db6c0af3a26b /sys/contrib/openzfs/module
parentaad780464fad1e32c97316515a4044d661413a6b (diff)
downloadsrc-4b84b4cca472e482bc22d5e5c7928be5a1393c84.tar.gz
src-4b84b4cca472e482bc22d5e5c7928be5a1393c84.zip
zfs: fix non-functional mismerges from vendor/openzfs
- fix copyright in module/os/freebsd/spl/spl_acl.c - fix mismerge in non-processed module/os/linux/zfs/zfs_uio.c MFC after: 3 days Obtained from: OpenZFS
Diffstat (limited to 'sys/contrib/openzfs/module')
-rw-r--r--sys/contrib/openzfs/module/os/freebsd/spl/spl_acl.c1
-rw-r--r--sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/sys/contrib/openzfs/module/os/freebsd/spl/spl_acl.c b/sys/contrib/openzfs/module/os/freebsd/spl/spl_acl.c
index 74c26d03f87f..18188ca0adec 100644
--- a/sys/contrib/openzfs/module/os/freebsd/spl/spl_acl.c
+++ b/sys/contrib/openzfs/module/os/freebsd/spl/spl_acl.c
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2008, 2009 Edward Tomasz NapieraƂa <trasz@FreeBSD.org>
+ * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c b/sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c
index 3e3fda20c72c..a3d5d5f83b6f 100644
--- a/sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c
+++ b/sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c
@@ -261,9 +261,6 @@ zfs_uio_prefaultpages(ssize_t n, zfs_uio_t *uio)
}
}
- if (iterp && iov_iter_fault_in_readable(iterp, n))
- return (EFAULT);
-#endif
return (0);
}
EXPORT_SYMBOL(zfs_uio_prefaultpages);