OpenAFS Master Repository branch, openafs-devel-1_7_x, updated. openafs-devel-1_7_18a-27-g10c073d

Gerrit Code Review gerrit@openafs.org
Fri, 9 Nov 2012 06:28:36 -0800 (PST)


The following commit has been merged in the openafs-devel-1_7_x branch:
commit 80365b9cce72e3d3785fbcef3e44716f852da8d5
Author: Jeffrey Altman <jaltman@your-file-system.com>
Date:   Thu Nov 8 00:24:14 2012 -0500

    Windows: cm_MergeStatus now returns an error code
    
    cm_MergeStatus() can fail if the AFSFetchStatus InterfaceVersion
    field does not have the value 0x1 as that is the only version that
    is defined by the protocol.  The return code will be CM_ERROR_INVAL.
    cm_MergeStatus() returns 0 on success.
    
    Update all of the call sites.
    
    Reviewed-on: http://gerrit.openafs.org/8402
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
    (cherry picked from commit 45f0a9ba7f139749a969e73362194b380988116d)
    
    Change-Id: I392e01b34333cc3e5ad6767b6b8c18ecc699709e
    Reviewed-on: http://gerrit.openafs.org/8415
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>

 src/WINNT/afsd/cm_callback.c |    4 ++--
 src/WINNT/afsd/cm_dcache.c   |   10 +++++-----
 src/WINNT/afsd/cm_scache.c   |   15 +++++++++------
 src/WINNT/afsd/cm_scache.h   |    2 +-
 src/WINNT/afsd/cm_vnodeops.c |   40 ++++++++++++++++++++--------------------
 5 files changed, 37 insertions(+), 34 deletions(-)

-- 
OpenAFS Master Repository