OpenAFS Master Repository branch, openafs-devel-1_7_x, updated. openafs-devel-1_7_26-33-g66bb4e2

[Gerrit Code Review]

The following commit has been merged in the openafs-devel-1_7_x branch:
commit 66bb4e2d33099b677e06031f7b6b5035c854d22e
Author: Jeffrey Altman <jaltman@your-file-system.com>
Date:   Fri Sep 27 18:02:52 2013 -0400

    Windows: cm_MergeStatus avoid lock recursion
    
    It is possible for cm_MergeStatus() to be called while the
    cm_buf_t.mx is already held.  If it is a panic occurs.  Test for
    refcount == 0 before acquiring the lock in addition to afterwards.
    If the refcount is not zero, then we do not need to acquire the
    lock in any case.
    
    Reviewed-on: http://gerrit.openafs.org/10297
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
    (cherry picked from commit 4f266f14c0721111a9d453c3358cddf77eb2641a)
    
    Change-Id: I9414011f50f65ea3fd92b4c7b521e128d886a6db
    Reviewed-on: http://gerrit.openafs.org/10302
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>

 src/WINNT/afsd/cm_scache.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

-- 
OpenAFS Master Repository