OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-379-gef4b9e1

Gerrit Code Review
Fri, 5 Nov 2010 13:12:01 -0700 (PDT)

The following commit has been merged in the master branch:
commit ef4b9e13ef6a79d7e5f540297e486189fdedf085
Author: Andrew Deason <>
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.
    Change-Id: Iebdbdf47c6307cd7c036b88ad4dbc25bc7a3279a
    Tested-by: Andrew Deason <>
    Reviewed-by: Derrick Brashear <>
    Tested-by: Derrick Brashear <>

 src/vol/volume.c |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

OpenAFS Master Repository