From 251de92a72c4c5a95aa58e5cb1cd3d6b0b3b6833 Mon Sep 17 00:00:00 2001 From: "Chas Williams (CONTRACTOR)" Date: Fri, 23 May 2014 07:48:11 -0400 Subject: [PATCH] afs/VNOPS: use osi_AllocSmallSpace() correctly Send the size down to the allocator so it can perform some consistency checks. Reviewed-on: http://gerrit.openafs.org/11168 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Reviewed-by: Michael Meffie Reviewed-by: Perry Ruiter Reviewed-by: Benjamin Kaduk Reviewed-by: D Brashear (cherry picked from commit 2d973c10f13b40c0ac9da25fe7f4c73b3560a686) Change-Id: I38d16bdd014010a2ccc9636b890c9ea7a6158e6a Reviewed-on: http://gerrit.openafs.org/11203 Tested-by: BuildBot Reviewed-by: D Brashear Reviewed-by: Benjamin Kaduk Reviewed-by: Stephan Wiesand --- src/afs/VNOPS/afs_vnop_create.c | 4 ++-- src/afs/VNOPS/afs_vnop_dirops.c | 4 ++-- src/afs/VNOPS/afs_vnop_link.c | 4 ++-- src/afs/VNOPS/afs_vnop_rename.c | 4 ++-- src/afs/VNOPS/afs_vnop_symlink.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/afs/VNOPS/afs_vnop_create.c b/src/afs/VNOPS/afs_vnop_create.c index 145ae926c..a3d612862 100644 --- a/src/afs/VNOPS/afs_vnop_create.c +++ b/src/afs/VNOPS/afs_vnop_create.c @@ -62,8 +62,8 @@ afs_create(OSI_VC_DECL(adp), char *aname, struct vattr *attrs, AFS_STATCNT(afs_create); - OutFidStatus = osi_AllocSmallSpace(AFS_SMALLOCSIZ); - OutDirStatus = osi_AllocSmallSpace(AFS_SMALLOCSIZ); + OutFidStatus = osi_AllocSmallSpace(sizeof(struct AFSFetchStatus)); + OutDirStatus = osi_AllocSmallSpace(sizeof(struct AFSFetchStatus)); if ((code = afs_InitReq(&treq, acred))) goto done2; diff --git a/src/afs/VNOPS/afs_vnop_dirops.c b/src/afs/VNOPS/afs_vnop_dirops.c index 84da54baa..e284222cd 100644 --- a/src/afs/VNOPS/afs_vnop_dirops.c +++ b/src/afs/VNOPS/afs_vnop_dirops.c @@ -59,8 +59,8 @@ afs_mkdir(OSI_VC_DECL(adp), char *aname, struct vattr *attrs, afs_Trace2(afs_iclSetp, CM_TRACE_MKDIR, ICL_TYPE_POINTER, adp, ICL_TYPE_STRING, aname); - OutFidStatus = osi_AllocSmallSpace(AFS_SMALLOCSIZ); - OutDirStatus = osi_AllocSmallSpace(AFS_SMALLOCSIZ); + OutFidStatus = osi_AllocSmallSpace(sizeof(struct AFSFetchStatus)); + OutDirStatus = osi_AllocSmallSpace(sizeof(struct AFSFetchStatus)); if ((code = afs_InitReq(&treq, acred))) goto done2; diff --git a/src/afs/VNOPS/afs_vnop_link.c b/src/afs/VNOPS/afs_vnop_link.c index 345799857..9a62ccc36 100644 --- a/src/afs/VNOPS/afs_vnop_link.c +++ b/src/afs/VNOPS/afs_vnop_link.c @@ -54,8 +54,8 @@ afs_link(struct vcache *avc, OSI_VC_DECL(adp), char *aname, afs_Trace3(afs_iclSetp, CM_TRACE_LINK, ICL_TYPE_POINTER, adp, ICL_TYPE_POINTER, avc, ICL_TYPE_STRING, aname); - OutFidStatus = osi_AllocSmallSpace(AFS_SMALLOCSIZ); - OutDirStatus = osi_AllocSmallSpace(AFS_SMALLOCSIZ); + OutFidStatus = osi_AllocSmallSpace(sizeof(struct AFSFetchStatus)); + OutDirStatus = osi_AllocSmallSpace(sizeof(struct AFSFetchStatus)); /* create a hard link; new entry is aname in dir adp */ if ((code = afs_InitReq(&treq, acred))) diff --git a/src/afs/VNOPS/afs_vnop_rename.c b/src/afs/VNOPS/afs_vnop_rename.c index 893fc8473..8dbc70e3e 100644 --- a/src/afs/VNOPS/afs_vnop_rename.c +++ b/src/afs/VNOPS/afs_vnop_rename.c @@ -51,8 +51,8 @@ afsrename(struct vcache *aodp, char *aname1, struct vcache *andp, ICL_TYPE_STRING, aname1, ICL_TYPE_POINTER, andp, ICL_TYPE_STRING, aname2); - OutOldDirStatus = osi_AllocSmallSpace(AFS_SMALLOCSIZ); - OutNewDirStatus = osi_AllocSmallSpace(AFS_SMALLOCSIZ); + OutOldDirStatus = osi_AllocSmallSpace(sizeof(struct AFSFetchStatus)); + OutNewDirStatus = osi_AllocSmallSpace(sizeof(struct AFSFetchStatus)); if (strlen(aname1) > AFSNAMEMAX || strlen(aname2) > AFSNAMEMAX) { code = ENAMETOOLONG; diff --git a/src/afs/VNOPS/afs_vnop_symlink.c b/src/afs/VNOPS/afs_vnop_symlink.c index 4e0b406a0..e83b42085 100644 --- a/src/afs/VNOPS/afs_vnop_symlink.c +++ b/src/afs/VNOPS/afs_vnop_symlink.c @@ -92,8 +92,8 @@ afs_symlink(OSI_VC_DECL(adp), char *aname, struct vattr *attrs, afs_Trace2(afs_iclSetp, CM_TRACE_SYMLINK, ICL_TYPE_POINTER, adp, ICL_TYPE_STRING, aname); - OutFidStatus = osi_AllocSmallSpace(AFS_SMALLOCSIZ); - OutDirStatus = osi_AllocSmallSpace(AFS_SMALLOCSIZ); + OutFidStatus = osi_AllocSmallSpace(sizeof(struct AFSFetchStatus)); + OutDirStatus = osi_AllocSmallSpace(sizeof(struct AFSFetchStatus)); if ((code = afs_InitReq(&treq, acred))) goto done2; -- 2.39.5