OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-devel-1_5_78-20-ga2a0965
Gerrit Code Review
gerrit@openafs.org
Tue, 7 Dec 2010 16:04:04 -0800 (PST)
The following commit has been merged in the openafs-stable-1_6_x branch:
commit a2a096547d341b3475c13ff9a2845284f973990f
Author: Andrew Deason <adeason@sinenomine.net>
Date: Fri Nov 5 14:34:05 2010 -0500
DAFS: Do not let VScheduleSalvage_r free vp
In VScheduleSalvage_r, we were calling VCancelReservation_r, which has
the possibility of free'ing vp. Since we still use vp after doing this
(and since we're already inside VCancelReservation_r to begin with),
we must not free vp. Instead, just decrement nWaiters without
triggering any of the dtor code in VCancelReservation_r. This is safe
as long as all VScheduleSalvage_r callers ensure that they check to
free the vp if necessary, which they all do.
Thanks to Derrick Brashear.
Reviewed-on: http://gerrit.openafs.org/3272
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit ef4b9e13ef6a79d7e5f540297e486189fdedf085)
Change-Id: I2f49d5eb6f9bad2343ee9a9c84ccbc1f323cc8a8
Reviewed-on: http://gerrit.openafs.org/3479
src/vol/volume.c | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
--
OpenAFS Master Repository