From: Benjamin Kaduk <kaduk@mit.edu>
Date: Tue, 8 May 2018 23:04:21 +0000 (-0500)
Subject: Use afs_DestroyReq in afs_PrefetchNoCache()
X-Git-Tag: upstream/1.8.1_pre2^2~34
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=881062ab6f67887ce08ab1000a6ac79c41b12c2f;p=packages%2Fo%2Fopenafs.git

Use afs_DestroyReq in afs_PrefetchNoCache()

Since commit 76ad941902c650a4a716168d3cbe68f62aef109f we use afs_DestroyReq()
instead of osi_Free() directly.

Also update the UKERNEL version of the function to afs_CreateReq() properly.

FIXES 134533

Reviewed-on: https://gerrit.openafs.org/13060
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit 3ec0414f769c37a19410fbd9aefb086cb5b69e55)

Change-Id: Ic85fef48f7adb2a152b5cb4d68b8c4a43c45c06a
Reviewed-on: https://gerrit.openafs.org/13114
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
---

diff --git a/src/afs/UKERNEL/afs_usrops.c b/src/afs/UKERNEL/afs_usrops.c
index 58e7b3057..6ebb580c1 100644
--- a/src/afs/UKERNEL/afs_usrops.c
+++ b/src/afs/UKERNEL/afs_usrops.c
@@ -2405,11 +2405,10 @@ uafs_pread_nocache_r(int fd, char *buf, int len, off_t offset)
 
     /* these get freed in PrefetchNoCache, so... */
     bparms = afs_osi_Alloc(sizeof(struct nocache_read_request));
-    bparms->areq = afs_osi_Alloc(sizeof(struct vrequest));
 
-    code = afs_InitReq(bparms->areq, get_user_struct()->u_cred);
+    code = afs_CreateReq(&bparms->areq, get_user_struct()->u_cred);
     if (code) {
-	afs_osi_Free(bparms->areq, sizeof(struct vrequest));
+	afs_DestroyReq(bparms->areq);
 	afs_osi_Free(bparms, sizeof(struct nocache_read_request));
 	errno = code;
 	return -1;
diff --git a/src/afs/afs_bypasscache.c b/src/afs/afs_bypasscache.c
index 76973d9c7..847eaf0b1 100644
--- a/src/afs/afs_bypasscache.c
+++ b/src/afs/afs_bypasscache.c
@@ -642,7 +642,7 @@ done:
     if (!code)
 	afs_ProcessFS(avc, &tcallspec->OutStatus, areq);
 
-    osi_Free(areq, sizeof(struct vrequest));
+    afs_DestroyReq(areq);
     osi_Free(tcallspec, sizeof(struct tlocal1));
     osi_Free(bparms, sizeof(struct nocache_read_request));
 #ifndef UKERNEL