Re: svn commit: r366252 - head/sys/contrib/openzfs/module/os/freebsd/zfs
On Tue, Sep 29, 2020 at 9:04 AM Mark Johnston wrote: > > On Tue, Sep 29, 2020 at 08:47:37AM -0500, Kyle Evans wrote: > > On Tue, Sep 29, 2020 at 8:42 AM Mark Johnston wrote: > > > > > > Author: markj > > > Date: Tue Sep 29 13:41:47 2020 > > > New Revision: 366252 > > > URL: https://svnweb.freebsd.org/changeset/base/366252 > > > > > > Log: > > > ZFS: Fix a logic bug in the FreeBSD getpages VOP > > > > > > This was introduced when I merged r361287 to OpenZFS and has been fixed > > > there already, commit 3f6bb6e43fd68e. > > > > > > Reported by: swills > > > Reviewed by: allanjude, freqlabs, mmacy > > > > > > > I think this should have been a commit to vendor-sys/zfs/dist with an > > svn merge into sys/contrib/openzfs to make 100% sure that there's no > > merge conflict (even trivial) upon mmacy's next import, though it's > > perhaps not likely for the code to change anymore upstream and svn > > might be smart enough to realize if the diff matches. You might > > consider going ahead and committing the diff to vendor-sys and doing a > > record-only MFC of that commit into sys/contrib/openzfs. > > Done in r366254. Excellent, thanks! ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r366252 - head/sys/contrib/openzfs/module/os/freebsd/zfs
On Tue, Sep 29, 2020 at 08:47:37AM -0500, Kyle Evans wrote: > On Tue, Sep 29, 2020 at 8:42 AM Mark Johnston wrote: > > > > Author: markj > > Date: Tue Sep 29 13:41:47 2020 > > New Revision: 366252 > > URL: https://svnweb.freebsd.org/changeset/base/366252 > > > > Log: > > ZFS: Fix a logic bug in the FreeBSD getpages VOP > > > > This was introduced when I merged r361287 to OpenZFS and has been fixed > > there already, commit 3f6bb6e43fd68e. > > > > Reported by: swills > > Reviewed by: allanjude, freqlabs, mmacy > > > > I think this should have been a commit to vendor-sys/zfs/dist with an > svn merge into sys/contrib/openzfs to make 100% sure that there's no > merge conflict (even trivial) upon mmacy's next import, though it's > perhaps not likely for the code to change anymore upstream and svn > might be smart enough to realize if the diff matches. You might > consider going ahead and committing the diff to vendor-sys and doing a > record-only MFC of that commit into sys/contrib/openzfs. Done in r366254. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r366252 - head/sys/contrib/openzfs/module/os/freebsd/zfs
On Tue, Sep 29, 2020 at 8:47 AM Kyle Evans wrote: > > On Tue, Sep 29, 2020 at 8:42 AM Mark Johnston wrote: > > > > Author: markj > > Date: Tue Sep 29 13:41:47 2020 > > New Revision: 366252 > > URL: https://svnweb.freebsd.org/changeset/base/366252 > > > > Log: > > ZFS: Fix a logic bug in the FreeBSD getpages VOP > > > > This was introduced when I merged r361287 to OpenZFS and has been fixed > > there already, commit 3f6bb6e43fd68e. > > > > Reported by: swills > > Reviewed by: allanjude, freqlabs, mmacy > > > > I think this should have been a commit to vendor-sys/zfs/dist with an > svn merge into sys/contrib/openzfs to make 100% sure that there's no > merge conflict (even trivial) upon mmacy's next import, though it's > perhaps not likely for the code to change anymore upstream and svn > might be smart enough to realize if the diff matches. You might > consider going ahead and committing the diff to vendor-sys and doing a > record-only MFC of that commit into sys/contrib/openzfs. > Bah, sorry: "record-only MFC" -> "record-only MFV" ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r366252 - head/sys/contrib/openzfs/module/os/freebsd/zfs
On Tue, Sep 29, 2020 at 8:42 AM Mark Johnston wrote: > > Author: markj > Date: Tue Sep 29 13:41:47 2020 > New Revision: 366252 > URL: https://svnweb.freebsd.org/changeset/base/366252 > > Log: > ZFS: Fix a logic bug in the FreeBSD getpages VOP > > This was introduced when I merged r361287 to OpenZFS and has been fixed > there already, commit 3f6bb6e43fd68e. > > Reported by: swills > Reviewed by: allanjude, freqlabs, mmacy > I think this should have been a commit to vendor-sys/zfs/dist with an svn merge into sys/contrib/openzfs to make 100% sure that there's no merge conflict (even trivial) upon mmacy's next import, though it's perhaps not likely for the code to change anymore upstream and svn might be smart enough to realize if the diff matches. You might consider going ahead and committing the diff to vendor-sys and doing a record-only MFC of that commit into sys/contrib/openzfs. Thanks, Kyle Evans ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r366252 - head/sys/contrib/openzfs/module/os/freebsd/zfs
Author: markj
Date: Tue Sep 29 13:41:47 2020
New Revision: 366252
URL: https://svnweb.freebsd.org/changeset/base/366252
Log:
ZFS: Fix a logic bug in the FreeBSD getpages VOP
This was introduced when I merged r361287 to OpenZFS and has been fixed
there already, commit 3f6bb6e43fd68e.
Reported by: swills
Reviewed by: allanjude, freqlabs, mmacy
Modified:
head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops.c
Modified: head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops.c
==
--- head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops.c Tue Sep 29
11:48:22 2020(r366251)
+++ head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops.c Tue Sep 29
13:41:47 2020(r366252)
@@ -4859,7 +4859,8 @@ zfs_getpages(struct vnode *vp, vm_page_t *ma, int coun
obj_size = object->un_pager.vnp.vnp_size;
zfs_vmobject_wunlock(object);
if (IDX_TO_OFF(ma[count - 1]->pindex) >= obj_size) {
- zfs_rangelock_exit(lr);
+ if (lr != NULL)
+ zfs_rangelock_exit(lr);
ZFS_EXIT(zfsvfs);
return (zfs_vm_pagerret_bad);
}
@@ -4887,7 +4888,8 @@ zfs_getpages(struct vnode *vp, vm_page_t *ma, int coun
error = dmu_read_pages(os, zp->z_id, ma, count, _b, _a,
MIN(end, obj_size) - (end - PAGE_SIZE));
- zfs_rangelock_exit(lr);
+ if (lr != NULL)
+ zfs_rangelock_exit(lr);
ZFS_ACCESSTIME_STAMP(zfsvfs, zp);
ZFS_EXIT(zfsvfs);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
