mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-25 11:47:43 +03:00
Remove bcopy(), bzero(), bcmp()
bcopy() has a confusing argument order and is actually a move, not a copy; they're all deprecated since POSIX.1-2001 and removed in -2008, and we shim them out to mem*() on Linux anyway Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes #12996
This commit is contained in:
@@ -687,10 +687,10 @@ zfs_copy_ace_2_fuid(zfsvfs_t *zfsvfs, umode_t obj_mode, zfs_acl_t *aclp,
|
||||
zobjacep = (zfs_object_ace_t *)aceptr;
|
||||
aceobjp = (ace_object_t *)acep;
|
||||
|
||||
bcopy(aceobjp->a_obj_type, zobjacep->z_object_type,
|
||||
memcpy(zobjacep->z_object_type, aceobjp->a_obj_type,
|
||||
sizeof (aceobjp->a_obj_type));
|
||||
bcopy(aceobjp->a_inherit_obj_type,
|
||||
zobjacep->z_inherit_type,
|
||||
memcpy(zobjacep->z_inherit_type,
|
||||
aceobjp->a_inherit_obj_type,
|
||||
sizeof (aceobjp->a_inherit_obj_type));
|
||||
acep = (ace_t *)((caddr_t)acep + sizeof (ace_object_t));
|
||||
break;
|
||||
@@ -737,11 +737,11 @@ zfs_copy_fuid_2_ace(zfsvfs_t *zfsvfs, zfs_acl_t *aclp, cred_t *cr,
|
||||
}
|
||||
zobjacep = (zfs_object_ace_t *)zacep;
|
||||
objacep = (ace_object_t *)acep;
|
||||
bcopy(zobjacep->z_object_type,
|
||||
objacep->a_obj_type,
|
||||
memcpy(objacep->a_obj_type,
|
||||
zobjacep->z_object_type,
|
||||
sizeof (zobjacep->z_object_type));
|
||||
bcopy(zobjacep->z_inherit_type,
|
||||
objacep->a_inherit_obj_type,
|
||||
memcpy(objacep->a_inherit_obj_type,
|
||||
zobjacep->z_inherit_type,
|
||||
sizeof (zobjacep->z_inherit_type));
|
||||
ace_size = sizeof (ace_object_t);
|
||||
break;
|
||||
@@ -1102,7 +1102,7 @@ zfs_acl_node_read(struct znode *zp, boolean_t have_lock, zfs_acl_t **aclpp,
|
||||
znode_acl.z_acl_extern_obj, 0, aclnode->z_size,
|
||||
aclnode->z_acldata, DMU_READ_PREFETCH);
|
||||
} else {
|
||||
bcopy(znode_acl.z_ace_data, aclnode->z_acldata,
|
||||
memcpy(aclnode->z_acldata, znode_acl.z_ace_data,
|
||||
aclnode->z_size);
|
||||
}
|
||||
} else {
|
||||
@@ -1447,7 +1447,7 @@ zfs_aclset_common(znode_t *zp, zfs_acl_t *aclp, cred_t *cr, dmu_tx_t *tx)
|
||||
aclnode = list_next(&aclp->z_acl, aclnode)) {
|
||||
if (aclnode->z_ace_count == 0)
|
||||
continue;
|
||||
bcopy(aclnode->z_acldata, start,
|
||||
memcpy(start, aclnode->z_acldata,
|
||||
aclnode->z_size);
|
||||
start = (caddr_t)start + aclnode->z_size;
|
||||
}
|
||||
@@ -1727,7 +1727,7 @@ zfs_acl_inherit(zfsvfs_t *zfsvfs, umode_t va_mode, zfs_acl_t *paclp,
|
||||
if ((data1sz = paclp->z_ops->ace_data(pacep, &data1)) != 0) {
|
||||
VERIFY((data2sz = aclp->z_ops->ace_data(acep,
|
||||
&data2)) == data1sz);
|
||||
bcopy(data1, data2, data2sz);
|
||||
memcpy(data2, data1, data2sz);
|
||||
}
|
||||
|
||||
aclp->z_acl_count++;
|
||||
@@ -1791,7 +1791,7 @@ zfs_acl_ids_create(znode_t *dzp, int flag, vattr_t *vap, cred_t *cr,
|
||||
boolean_t trim = B_FALSE;
|
||||
boolean_t inherited = B_FALSE;
|
||||
|
||||
bzero(acl_ids, sizeof (zfs_acl_ids_t));
|
||||
memset(acl_ids, 0, sizeof (zfs_acl_ids_t));
|
||||
acl_ids->z_mode = vap->va_mode;
|
||||
|
||||
if (vsecp)
|
||||
@@ -2016,7 +2016,7 @@ zfs_getacl(znode_t *zp, vsecattr_t *vsecp, boolean_t skipaclchk, cred_t *cr)
|
||||
|
||||
for (aclnode = list_head(&aclp->z_acl); aclnode;
|
||||
aclnode = list_next(&aclp->z_acl, aclnode)) {
|
||||
bcopy(aclnode->z_acldata, start,
|
||||
memcpy(start, aclnode->z_acldata,
|
||||
aclnode->z_size);
|
||||
start = (caddr_t)start + aclnode->z_size;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user