The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=4b84b4cca472e482bc22d5e5c7928be5a1393c84
commit 4b84b4cca472e482bc22d5e5c7928be5a1393c84 Author: Martin Matuska <[email protected]> AuthorDate: 2021-04-26 01:05:13 +0000 Commit: Martin Matuska <[email protected]> CommitDate: 2021-04-26 01:05:13 +0000 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 --- sys/contrib/openzfs/module/os/freebsd/spl/spl_acl.c | 1 + sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c | 3 --- 2 files changed, 1 insertion(+), 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 <[email protected]> + * 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); _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "[email protected]"
