diff options
| author | Jeremy Allison <jra@samba.org> | 2007-04-27 23:18:41 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-04-27 23:18:41 +0000 |
| commit | 04fd9ba97be2034004c20eab00c89099e6883bea (patch) | |
| tree | d72ebd488852f73cd035da10e2215d243d0fb354 /source/modules/vfs_gpfs.c | |
| parent | 3d32042d58bdb4b9f4e6564ced87efc88478681b (diff) | |
| download | samba-04fd9ba97be2034004c20eab00c89099e6883bea.tar.gz samba-04fd9ba97be2034004c20eab00c89099e6883bea.tar.xz samba-04fd9ba97be2034004c20eab00c89099e6883bea.zip | |
r22542: Move over to using the _strict varients of the talloc
calls. No functional changes. Looks bigger than it is :-).
Jeremy.
Diffstat (limited to 'source/modules/vfs_gpfs.c')
| -rw-r--r-- | source/modules/vfs_gpfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/modules/vfs_gpfs.c b/source/modules/vfs_gpfs.c index 6841300d5b3..932b5000c83 100644 --- a/source/modules/vfs_gpfs.c +++ b/source/modules/vfs_gpfs.c @@ -104,7 +104,7 @@ static struct gpfs_acl *gpfs_getacl_alloc(const char *fname, gpfs_aclType_t type int ret; TALLOC_CTX *mem_ctx = main_loop_talloc_get(); - acl = (struct gpfs_acl *)talloc_size(mem_ctx, len); + acl = (struct gpfs_acl *)TALLOC_SIZE(mem_ctx, len); if (acl == NULL) { errno = ENOMEM; return NULL; @@ -117,7 +117,7 @@ static struct gpfs_acl *gpfs_getacl_alloc(const char *fname, gpfs_aclType_t type ret = smbd_gpfs_getacl((char *)fname, GPFS_GETACL_STRUCT | GPFS_ACL_SAMBA, acl); if ((ret != 0) && (errno == ENOSPC)) { - struct gpfs_acl *new_acl = (struct gpfs_acl *)talloc_size( + struct gpfs_acl *new_acl = (struct gpfs_acl *)TALLOC_SIZE( mem_ctx, acl->acl_len + sizeof(struct gpfs_acl)); if (new_acl == NULL) { errno = ENOMEM; @@ -260,7 +260,7 @@ static BOOL gpfsacl_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl) gacl_len = sizeof(struct gpfs_acl) + (smb_get_naces(smbacl)-1)*sizeof(gpfs_ace_v4_t); - gacl = talloc_size(mem_ctx, gacl_len); + gacl = TALLOC_SIZE(mem_ctx, gacl_len); if (gacl == NULL) { DEBUG(0, ("talloc failed\n")); errno = ENOMEM; |