d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zfs: fix non-functional mismerges from vendor/openzfs

Browse Source 
- 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
This commit is contained in:
Martin Matuska 2021-04-26 03:05:13 +02:00
parent aad780464f
commit 4b84b4cca4
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/contrib/openzfs/module/os/freebsd/spl/spl_acl.c
View File

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@FreeBSD.org> * 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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions

3
sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c
View File

@ -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); return (0);
} }
EXPORT_SYMBOL(zfs_uio_prefaultpages); EXPORT_SYMBOL(zfs_uio_prefaultpages);