From: Jim Rees Date: Mon, 31 Jan 2005 04:19:41 +0000 (+0000) Subject: STABLE14-alloc-confusion-20040120 X-Git-Tag: openafs-devel-1_3_78~22 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=6764e021ddc4e52da901d3d606292db1612734bd;p=packages%2Fo%2Fopenafs.git STABLE14-alloc-confusion-20040120 use osi_Alloc instead of osi_AllocLargeSpace for tokens, to match free (cherry picked from commit a0ce71a84374cc0600813a3101b76f89df04ee76) --- diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c index 84a732986..c1cd5e161 100644 --- a/src/afs/afs_pioctl.c +++ b/src/afs/afs_pioctl.c @@ -1119,8 +1119,9 @@ afs_HandlePioctl(struct vnode *avp, afs_int32 acom, if (inSize > MAXPIOCTLTOKENLEN || inSize < 0 || ablob->out_size < 0) return E2BIG; + /* Note that we use osi_Alloc for large allocs and osi_AllocLargeSpace for small ones */ if (inSize > AFS_LRALLOCSIZ) { - inData = osi_AllocLargeSpace(inSize + 1); + inData = osi_Alloc(inSize + 1); } else { inData = osi_AllocLargeSpace(AFS_LRALLOCSIZ); }