This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch master in repository hurd.
commit eadfa7a79ca84fd9e40d34bbdcf0ab1ee6b9fc27 Author: Samuel Thibault <[email protected]> Date: Thu Jun 2 23:49:21 2016 +0000 fix nfs assertion failure --- debian/changelog | 7 +++++ .../git-dd93fc4bfbaceb65ded2aefca35042438c95f4d5 | 31 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 39 insertions(+) diff --git a/debian/changelog b/debian/changelog index faad1a7..fff6b25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +hurd (1:0.8.git20160522-4) unstable; urgency=medium + + * patches/git-dd93fc4bfbaceb65ded2aefca35042438c95f4d5: Cherry-pick from + upstream to fix nfs assertion failure. + + -- Samuel Thibault <[email protected]> Thu, 02 Jun 2016 23:02:40 +0000 + hurd (1:0.8.git20160522-3) unstable; urgency=medium * control: Bump Standards-Version to 3.9.8 (no change) diff --git a/debian/patches/git-dd93fc4bfbaceb65ded2aefca35042438c95f4d5 b/debian/patches/git-dd93fc4bfbaceb65ded2aefca35042438c95f4d5 new file mode 100644 index 0000000..58d1df2 --- /dev/null +++ b/debian/patches/git-dd93fc4bfbaceb65ded2aefca35042438c95f4d5 @@ -0,0 +1,31 @@ +commit dd93fc4bfbaceb65ded2aefca35042438c95f4d5 +Author: Justus Winter <[email protected]> +Date: Fri Jun 3 00:45:11 2016 +0200 + + nfs: appease the stricter reference counting mechanism + + * nfs/cache.c (netfs_node_norefs): Do not re-acquire a reference to + np. This worked previously, but the new reference counting primitives + consider this a use after free. A reference is really not necessary + here, we are about to deallocate np anyway. + + Amends 5eef605e. + +diff --git a/nfs/cache.c b/nfs/cache.c +index 2015603..ecf3b11 100644 +--- a/nfs/cache.c ++++ b/nfs/cache.c +@@ -129,13 +129,10 @@ netfs_node_norefs (struct node *np) + args = malloc (sizeof (struct fnd)); + assert (args); + +- netfs_nref (np); +- + args->dir = np->nn->dead_dir; + args->name = np->nn->dead_name; + np->nn->dead_dir = 0; + np->nn->dead_name = 0; +- netfs_nput (np); + + /* Do this in a separate thread so that we don't wait for it; it + acquires a lock on the dir, which we are not allowed to diff --git a/debian/patches/series b/debian/patches/series index 3a3f8a6..b03fe6a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -32,3 +32,4 @@ git-0ab3825f250486453892e3e18a702a44538bff6d git-60d14f5b3c4ea27af6f4220a15947c328bc888ee git-malloc-hook git-293e86998748bae2d7a8179ad198ec3452f0d472 +git-dd93fc4bfbaceb65ded2aefca35042438c95f4d5 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/hurd.git
