STABLE14-obsd-resid-type-20080104

use correct type for resid when calling vn_rdwr()

(cherry picked from commit 034f698ebf21854c8dfb46567fc4ec2ac21457f0)

diff --git a/src/afs/OBSD/osi_file.c b/src/afs/OBSD/osi_file.c
index b838eee127c8fb7722e8d8805825f1ad10b949e7..39328bef9c24ba7e6bc243f8bf38fbd784776fb5 100644 (file)
--- a/src/afs/OBSD/osi_file.c
+++ b/src/afs/OBSD/osi_file.c
@@ -136,7 +136,7 @@ osi_DisableAtimes(struct vnode *avp)
 int
 afs_osi_Read(struct osi_file *afile, int offset, void *aptr, afs_int32 asize)
 {
-    unsigned int resid;
+    size_t resid;
     afs_int32 code;
 
     AFS_STATCNT(osi_Read);
@@ -164,8 +164,8 @@ afs_osi_Read(struct osi_file *afile, int offset, void *aptr, afs_int32 asize)
        afile->offset += code;
        osi_DisableAtimes(afile->vnode);
     } else {
-       afs_Trace2(afs_iclSetp, CM_TRACE_READFAILED, ICL_TYPE_INT32, resid,
-                  ICL_TYPE_INT32, code);
+       afs_Trace2(afs_iclSetp, CM_TRACE_READFAILED, ICL_TYPE_INT32,
+                  (unsigned int) resid, ICL_TYPE_INT32, code);
        code = -1;
     }
     return code;
@@ -176,7 +176,7 @@ int
 afs_osi_Write(struct osi_file *afile, afs_int32 offset, void *aptr,
              afs_int32 asize)
 {
-    unsigned int resid;
+    size_t resid;
     afs_int32 code;
 
     AFS_STATCNT(osi_Write);