The following commit has been merged in the openafs-stable-1_6_x branch:
commit 6041ddf65c5a11725b800372fb1fbec8ba079cd1
Author: Andrew Deason <[email protected]>
Date:   Tue Oct 2 15:04:47 2012 -0500

    afs: Use common cleanup code for lockctl EINVAL
    
    afs_lockctl has common cleanup code in the 'done' label. Use it here,
    instead of trying to duplicate it.
    
    Currently this code path appears to not be dropping the discon lock,
    which this rectifies.
    
    Reviewed-on: http://gerrit.openafs.org/8196
    Reviewed-by: Jeffrey Altman <[email protected]>
    Reviewed-by: Derrick Brashear <[email protected]>
    Tested-by: BuildBot <[email protected]>
    (cherry picked from commit eae608d99a5ae94624200f91af6ed818c9f6612b)
    
    This commit fixes a vrequest leak introduced by change
    I1c60701d4e4f85aedfea6be58a03468ab34edb96.  On master, the corresponding
    changes appear in the opposite order.
    
    Change-Id: I1f7a5794f19abb1495bbab6014c3ccde99cf0e1d
    Reviewed-on: http://gerrit.openafs.org/11381
    Reviewed-by: Andrew Deason <[email protected]>
    Tested-by: BuildBot <[email protected]>
    Reviewed-by: Stephan Wiesand <[email protected]>

 src/afs/VNOPS/afs_vnop_flock.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

-- 
OpenAFS Master Repository
_______________________________________________
OpenAFS-cvs mailing list
[email protected]
https://lists.openafs.org/mailman/listinfo/openafs-cvs

Reply via email to