afs_bypasscache: parameters of afs_ReadNoCache can't be null

The first two parameters of afs_ReadNoCache() are unconditionally
indirected through, and all existing callers appear to guarantee
that these parameters are in fact non-null, so annotate the function
declaration to so indicate, and remove the one test that checks
whether avc (the first parameter) is null.  I suspect that acred
cannot be null either, but this code does not appear to depend on
that, so it's not included in the non-null annotation.

Change-Id: I496c868ffcbc9b894f91578019bc30bf7b14fefd
Reviewed-on: http://gerrit.openafs.org/7837
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Alistair Ferguson <alistair.ferguson@mac.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>

diff --git a/src/afs/afs_bypasscache.c b/src/afs/afs_bypasscache.c
index dd6ff1c7a055e76928825158ab93cece0828d19b..18d6d6c9dcf9c80ba38f2e8a2dcb7701055bcd95 100644 (file)
--- a/src/afs/afs_bypasscache.c
+++ b/src/afs/afs_bypasscache.c
@@ -492,7 +492,7 @@ afs_ReadNoCache(struct vcache *avc,
     /* the reciever will free this */
     areq = osi_Alloc(sizeof(struct vrequest));
 
-    if (avc && avc->vc_error) {
+    if (avc->vc_error) {
        code = EIO;
        afs_warn("afs_ReadNoCache VCache Error!\n");
        goto cleanup;

diff --git a/src/afs/afs_bypasscache.h b/src/afs/afs_bypasscache.h
index 2a86eac7ff60f2d10355f30bab68224e9b542f3e..5b6d22075ba474dfdb7bd5dd33d3a7fc3e916bf3 100644 (file)
--- a/src/afs/afs_bypasscache.h
+++ b/src/afs/afs_bypasscache.h
@@ -132,7 +132,7 @@ void afs_TransitionToCaching(struct vcache *, afs_ucred_t *, int);
 /* dispatch a no-cache read request */
 afs_int32
 afs_ReadNoCache(struct vcache *avc, struct nocache_read_request *bparms,
-               afs_ucred_t *acred);
+               afs_ucred_t *acred) AFS_NONNULL((1,2));
 
 /* no-cache prefetch routine */
 afs_int32