[Glibc-bsd-commits] r3914 - in trunk: kfreebsd-10/debian kfreebsd-10/debian/patches kfreebsd-8/debian kfreebsd-8/debian/patches kfreebsd-9/debian kfreebsd-9/debian/patches
Robert Millan
rmh at alioth.debian.org
Sat Dec 3 16:37:13 UTC 2011
Author: rmh
Date: 2011-12-03 16:37:12 +0000 (Sat, 03 Dec 2011)
New Revision: 3914
Added:
trunk/kfreebsd-10/debian/patches/101_nullfs_vsock.diff
trunk/kfreebsd-8/debian/patches/101_nullfs_vsock.diff
trunk/kfreebsd-9/debian/patches/101_nullfs_vsock.diff
Modified:
trunk/kfreebsd-10/debian/changelog
trunk/kfreebsd-10/debian/patches/series
trunk/kfreebsd-8/debian/changelog
trunk/kfreebsd-8/debian/patches/series
trunk/kfreebsd-9/debian/changelog
trunk/kfreebsd-9/debian/patches/series
Log:
108_teken_utf8_table.diff: Fix sockets over nullfs.
Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog 2011-12-03 16:35:31 UTC (rev 3913)
+++ trunk/kfreebsd-10/debian/changelog 2011-12-03 16:37:12 UTC (rev 3914)
@@ -2,8 +2,9 @@
* Use major number for kfreebsd.gz in kernel-image, so that it can be
installed alongside other kfreebsd versions.
+ * 108_teken_utf8_table.diff: Fix sockets over nullfs.
- -- Robert Millan <rmh at debian.org> Sun, 27 Nov 2011 15:00:45 +0100
+ -- Robert Millan <rmh at debian.org> Sat, 03 Dec 2011 17:36:20 +0100
kfreebsd-10 (10.0~svn227875-1) experimental; urgency=low
Added: trunk/kfreebsd-10/debian/patches/101_nullfs_vsock.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/101_nullfs_vsock.diff (rev 0)
+++ trunk/kfreebsd-10/debian/patches/101_nullfs_vsock.diff 2011-12-03 16:37:12 UTC (rev 3914)
@@ -0,0 +1,54 @@
+
+Obtained from kern/159663
+
+--- a/sys/fs/nullfs/null_vnops.c
++++ b/sys/fs/nullfs/null_vnops.c
+@@ -365,16 +365,38 @@
+ vrele(lvp);
+ } else {
+ error = null_nodeget(dvp->v_mount, lvp, &vp);
+- if (error)
++ if (error) {
+ vput(lvp);
+- else
++ } else if (vp->v_type == VSOCK) {
++ vref(lvp);
++ vrele(vp);
++ *ap->a_vpp = lvp;
++ } else {
+ *ap->a_vpp = vp;
++ }
+ }
+ }
+ return (error);
+ }
+
+ static int
++null_create(struct vop_create_args *ap)
++{
++ struct vnode *vp, *lvp;
++ int retval;
++
++ retval = null_bypass(&ap->a_gen);
++ vp = *ap->a_vpp;
++ if (retval == 0 && vp->v_type == VSOCK) {
++ lvp = NULLVPTOLOWERVP(vp);
++ vref(lvp);
++ vrele(vp);
++ *ap->a_vpp = lvp;
++ }
++ return (retval);
++}
++
++static int
+ null_open(struct vop_open_args *ap)
+ {
+ int retval;
+@@ -825,6 +847,7 @@
+ .vop_accessx = null_accessx,
+ .vop_advlockpurge = vop_stdadvlockpurge,
+ .vop_bmap = VOP_EOPNOTSUPP,
++ .vop_create = null_create,
+ .vop_getattr = null_getattr,
+ .vop_getwritemount = null_getwritemount,
+ .vop_inactive = null_inactive,
Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series 2011-12-03 16:35:31 UTC (rev 3913)
+++ trunk/kfreebsd-10/debian/patches/series 2011-12-03 16:37:12 UTC (rev 3914)
@@ -6,6 +6,7 @@
#007_clone_signals.diff
008_verioned_freebsd_macro.diff
#009_disable_duped_modules.diff
+101_nullfs_vsock.diff
107_mount_update.diff
109_linprocfs_non_x86.diff
110_disable_trampoline_flavour.diff
Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog 2011-12-03 16:35:31 UTC (rev 3913)
+++ trunk/kfreebsd-8/debian/changelog 2011-12-03 16:37:12 UTC (rev 3914)
@@ -1,3 +1,9 @@
+kfreebsd-8 (8.2-16) UNRELEASED; urgency=low
+
+ * 108_teken_utf8_table.diff: Fix sockets over nullfs.
+
+ -- Robert Millan <rmh at debian.org> Sat, 03 Dec 2011 17:36:42 +0100
+
kfreebsd-8 (8.2-15) unstable; urgency=low
* Build udebs for the installer.
Added: trunk/kfreebsd-8/debian/patches/101_nullfs_vsock.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/101_nullfs_vsock.diff (rev 0)
+++ trunk/kfreebsd-8/debian/patches/101_nullfs_vsock.diff 2011-12-03 16:37:12 UTC (rev 3914)
@@ -0,0 +1,54 @@
+
+Obtained from kern/159663
+
+--- a/sys/fs/nullfs/null_vnops.c
++++ b/sys/fs/nullfs/null_vnops.c
+@@ -365,16 +365,38 @@
+ vrele(lvp);
+ } else {
+ error = null_nodeget(dvp->v_mount, lvp, &vp);
+- if (error)
++ if (error) {
+ vput(lvp);
+- else
++ } else if (vp->v_type == VSOCK) {
++ vref(lvp);
++ vrele(vp);
++ *ap->a_vpp = lvp;
++ } else {
+ *ap->a_vpp = vp;
++ }
+ }
+ }
+ return (error);
+ }
+
+ static int
++null_create(struct vop_create_args *ap)
++{
++ struct vnode *vp, *lvp;
++ int retval;
++
++ retval = null_bypass(&ap->a_gen);
++ vp = *ap->a_vpp;
++ if (retval == 0 && vp->v_type == VSOCK) {
++ lvp = NULLVPTOLOWERVP(vp);
++ vref(lvp);
++ vrele(vp);
++ *ap->a_vpp = lvp;
++ }
++ return (retval);
++}
++
++static int
+ null_open(struct vop_open_args *ap)
+ {
+ int retval;
+@@ -825,6 +847,7 @@
+ .vop_access = null_access,
+ .vop_accessx = null_accessx,
+ .vop_bmap = VOP_EOPNOTSUPP,
++ .vop_create = null_create,
+ .vop_getattr = null_getattr,
+ .vop_getwritemount = null_getwritemount,
+ .vop_inactive = null_inactive,
Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series 2011-12-03 16:35:31 UTC (rev 3913)
+++ trunk/kfreebsd-8/debian/patches/series 2011-12-03 16:37:12 UTC (rev 3914)
@@ -17,6 +17,7 @@
#009_disable_duped_modules.diff
013_ip_packed.diff
021_superpages_i386.diff
+101_nullfs_vsock.diff
103_stat_pipe.diff
105_apm_amd64.diff
107_mount_update.diff
Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog 2011-12-03 16:35:31 UTC (rev 3913)
+++ trunk/kfreebsd-9/debian/changelog 2011-12-03 16:37:12 UTC (rev 3914)
@@ -1,3 +1,9 @@
+kfreebsd-9 (9.0~svn227451-7) UNRELEASED; urgency=low
+
+ * 108_teken_utf8_table.diff: Fix sockets over nullfs.
+
+ -- Robert Millan <rmh at debian.org> Sat, 03 Dec 2011 17:36:31 +0100
+
kfreebsd-9 (9.0~svn227451-6) unstable; urgency=high
* Fix kernel-image major number suffix hack.
Added: trunk/kfreebsd-9/debian/patches/101_nullfs_vsock.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/101_nullfs_vsock.diff (rev 0)
+++ trunk/kfreebsd-9/debian/patches/101_nullfs_vsock.diff 2011-12-03 16:37:12 UTC (rev 3914)
@@ -0,0 +1,54 @@
+
+Obtained from kern/159663
+
+--- a/sys/fs/nullfs/null_vnops.c
++++ b/sys/fs/nullfs/null_vnops.c
+@@ -365,16 +365,38 @@
+ vrele(lvp);
+ } else {
+ error = null_nodeget(dvp->v_mount, lvp, &vp);
+- if (error)
++ if (error) {
+ vput(lvp);
+- else
++ } else if (vp->v_type == VSOCK) {
++ vref(lvp);
++ vrele(vp);
++ *ap->a_vpp = lvp;
++ } else {
+ *ap->a_vpp = vp;
++ }
+ }
+ }
+ return (error);
+ }
+
+ static int
++null_create(struct vop_create_args *ap)
++{
++ struct vnode *vp, *lvp;
++ int retval;
++
++ retval = null_bypass(&ap->a_gen);
++ vp = *ap->a_vpp;
++ if (retval == 0 && vp->v_type == VSOCK) {
++ lvp = NULLVPTOLOWERVP(vp);
++ vref(lvp);
++ vrele(vp);
++ *ap->a_vpp = lvp;
++ }
++ return (retval);
++}
++
++static int
+ null_open(struct vop_open_args *ap)
+ {
+ int retval;
+@@ -826,6 +848,7 @@
+ .vop_accessx = null_accessx,
+ .vop_advlockpurge = vop_stdadvlockpurge,
+ .vop_bmap = VOP_EOPNOTSUPP,
++ .vop_create = null_create,
+ .vop_getattr = null_getattr,
+ .vop_getwritemount = null_getwritemount,
+ .vop_inactive = null_inactive,
Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series 2011-12-03 16:35:31 UTC (rev 3913)
+++ trunk/kfreebsd-9/debian/patches/series 2011-12-03 16:37:12 UTC (rev 3914)
@@ -6,6 +6,7 @@
006_mips_i8259_alloc.diff
#007_clone_signals.diff
#009_disable_duped_modules.diff
+101_nullfs_vsock.diff
107_mount_update.diff
108_teken_utf8_table.diff
109_linprocfs_non_x86.diff
More information about the Glibc-bsd-commits
mailing list