mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-25 18:59:33 +03:00
Fix -Wattribute-warning in zfs_log_xvattr()
Restructure the code in zfs_log_xvattr() to use a lr_attr_end structure when accessing lr_attr_t elements located after the variable sized array. This makes the code more understandable and resolves the accessing beyond the end of the field warnings. Reviewed-by: Ryan Moeller <ryan@iXsystems.com> Reviewed-by: Alexander Motin <mav@FreeBSD.org> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #13528 Closes #13575
This commit is contained in:
parent
a6e8113fed
commit
b0f7dd276c
@ -223,6 +223,15 @@ typedef struct {
|
|||||||
uint64_t lr_foid; /* object id */
|
uint64_t lr_foid; /* object id */
|
||||||
} lr_ooo_t;
|
} lr_ooo_t;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Additional lr_attr_t fields.
|
||||||
|
*/
|
||||||
|
typedef struct {
|
||||||
|
uint64_t lr_attr_attrs; /* all of the attributes */
|
||||||
|
uint64_t lr_attr_crtime[2]; /* create time */
|
||||||
|
uint8_t lr_attr_scanstamp[32];
|
||||||
|
} lr_attr_end_t;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Handle option extended vattr attributes.
|
* Handle option extended vattr attributes.
|
||||||
*
|
*
|
||||||
@ -233,7 +242,7 @@ typedef struct {
|
|||||||
typedef struct {
|
typedef struct {
|
||||||
uint32_t lr_attr_masksize; /* number of elements in array */
|
uint32_t lr_attr_masksize; /* number of elements in array */
|
||||||
uint32_t lr_attr_bitmap; /* First entry of array */
|
uint32_t lr_attr_bitmap; /* First entry of array */
|
||||||
/* remainder of array and any additional fields */
|
/* remainder of array and additional lr_attr_end_t fields */
|
||||||
} lr_attr_t;
|
} lr_attr_t;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -107,86 +107,81 @@ zfs_log_create_txtype(zil_create_t type, vsecattr_t *vsecp, vattr_t *vap)
|
|||||||
static void
|
static void
|
||||||
zfs_log_xvattr(lr_attr_t *lrattr, xvattr_t *xvap)
|
zfs_log_xvattr(lr_attr_t *lrattr, xvattr_t *xvap)
|
||||||
{
|
{
|
||||||
uint32_t *bitmap;
|
xoptattr_t *xoap;
|
||||||
uint64_t *attrs;
|
|
||||||
uint64_t *crtime;
|
|
||||||
xoptattr_t *xoap;
|
|
||||||
void *scanstamp;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
xoap = xva_getxoptattr(xvap);
|
xoap = xva_getxoptattr(xvap);
|
||||||
ASSERT(xoap);
|
ASSERT(xoap);
|
||||||
|
|
||||||
lrattr->lr_attr_masksize = xvap->xva_mapsize;
|
lrattr->lr_attr_masksize = xvap->xva_mapsize;
|
||||||
bitmap = &lrattr->lr_attr_bitmap;
|
uint32_t *bitmap = &lrattr->lr_attr_bitmap;
|
||||||
for (i = 0; i != xvap->xva_mapsize; i++, bitmap++) {
|
for (int i = 0; i != xvap->xva_mapsize; i++, bitmap++)
|
||||||
*bitmap = xvap->xva_reqattrmap[i];
|
*bitmap = xvap->xva_reqattrmap[i];
|
||||||
}
|
|
||||||
|
|
||||||
/* Now pack the attributes up in a single uint64_t */
|
lr_attr_end_t *end = (lr_attr_end_t *)bitmap;
|
||||||
attrs = (uint64_t *)bitmap;
|
end->lr_attr_attrs = 0;
|
||||||
*attrs = 0;
|
end->lr_attr_crtime[0] = 0;
|
||||||
crtime = attrs + 1;
|
end->lr_attr_crtime[1] = 0;
|
||||||
memset(crtime, 0, 2 * sizeof (uint64_t));
|
memset(end->lr_attr_scanstamp, 0, AV_SCANSTAMP_SZ);
|
||||||
scanstamp = (caddr_t)(crtime + 2);
|
|
||||||
memset(scanstamp, 0, AV_SCANSTAMP_SZ);
|
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_READONLY))
|
if (XVA_ISSET_REQ(xvap, XAT_READONLY))
|
||||||
*attrs |= (xoap->xoa_readonly == 0) ? 0 :
|
end->lr_attr_attrs |= (xoap->xoa_readonly == 0) ? 0 :
|
||||||
XAT0_READONLY;
|
XAT0_READONLY;
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_HIDDEN))
|
if (XVA_ISSET_REQ(xvap, XAT_HIDDEN))
|
||||||
*attrs |= (xoap->xoa_hidden == 0) ? 0 :
|
end->lr_attr_attrs |= (xoap->xoa_hidden == 0) ? 0 :
|
||||||
XAT0_HIDDEN;
|
XAT0_HIDDEN;
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_SYSTEM))
|
if (XVA_ISSET_REQ(xvap, XAT_SYSTEM))
|
||||||
*attrs |= (xoap->xoa_system == 0) ? 0 :
|
end->lr_attr_attrs |= (xoap->xoa_system == 0) ? 0 :
|
||||||
XAT0_SYSTEM;
|
XAT0_SYSTEM;
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_ARCHIVE))
|
if (XVA_ISSET_REQ(xvap, XAT_ARCHIVE))
|
||||||
*attrs |= (xoap->xoa_archive == 0) ? 0 :
|
end->lr_attr_attrs |= (xoap->xoa_archive == 0) ? 0 :
|
||||||
XAT0_ARCHIVE;
|
XAT0_ARCHIVE;
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_IMMUTABLE))
|
if (XVA_ISSET_REQ(xvap, XAT_IMMUTABLE))
|
||||||
*attrs |= (xoap->xoa_immutable == 0) ? 0 :
|
end->lr_attr_attrs |= (xoap->xoa_immutable == 0) ? 0 :
|
||||||
XAT0_IMMUTABLE;
|
XAT0_IMMUTABLE;
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_NOUNLINK))
|
if (XVA_ISSET_REQ(xvap, XAT_NOUNLINK))
|
||||||
*attrs |= (xoap->xoa_nounlink == 0) ? 0 :
|
end->lr_attr_attrs |= (xoap->xoa_nounlink == 0) ? 0 :
|
||||||
XAT0_NOUNLINK;
|
XAT0_NOUNLINK;
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_APPENDONLY))
|
if (XVA_ISSET_REQ(xvap, XAT_APPENDONLY))
|
||||||
*attrs |= (xoap->xoa_appendonly == 0) ? 0 :
|
end->lr_attr_attrs |= (xoap->xoa_appendonly == 0) ? 0 :
|
||||||
XAT0_APPENDONLY;
|
XAT0_APPENDONLY;
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_OPAQUE))
|
if (XVA_ISSET_REQ(xvap, XAT_OPAQUE))
|
||||||
*attrs |= (xoap->xoa_opaque == 0) ? 0 :
|
end->lr_attr_attrs |= (xoap->xoa_opaque == 0) ? 0 :
|
||||||
XAT0_APPENDONLY;
|
XAT0_APPENDONLY;
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_NODUMP))
|
if (XVA_ISSET_REQ(xvap, XAT_NODUMP))
|
||||||
*attrs |= (xoap->xoa_nodump == 0) ? 0 :
|
end->lr_attr_attrs |= (xoap->xoa_nodump == 0) ? 0 :
|
||||||
XAT0_NODUMP;
|
XAT0_NODUMP;
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_AV_QUARANTINED))
|
if (XVA_ISSET_REQ(xvap, XAT_AV_QUARANTINED))
|
||||||
*attrs |= (xoap->xoa_av_quarantined == 0) ? 0 :
|
end->lr_attr_attrs |= (xoap->xoa_av_quarantined == 0) ? 0 :
|
||||||
XAT0_AV_QUARANTINED;
|
XAT0_AV_QUARANTINED;
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_AV_MODIFIED))
|
if (XVA_ISSET_REQ(xvap, XAT_AV_MODIFIED))
|
||||||
*attrs |= (xoap->xoa_av_modified == 0) ? 0 :
|
end->lr_attr_attrs |= (xoap->xoa_av_modified == 0) ? 0 :
|
||||||
XAT0_AV_MODIFIED;
|
XAT0_AV_MODIFIED;
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_CREATETIME))
|
if (XVA_ISSET_REQ(xvap, XAT_CREATETIME))
|
||||||
ZFS_TIME_ENCODE(&xoap->xoa_createtime, crtime);
|
ZFS_TIME_ENCODE(&xoap->xoa_createtime, end->lr_attr_crtime);
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_AV_SCANSTAMP)) {
|
if (XVA_ISSET_REQ(xvap, XAT_AV_SCANSTAMP)) {
|
||||||
ASSERT(!XVA_ISSET_REQ(xvap, XAT_PROJID));
|
ASSERT(!XVA_ISSET_REQ(xvap, XAT_PROJID));
|
||||||
|
|
||||||
memcpy(scanstamp, xoap->xoa_av_scanstamp, AV_SCANSTAMP_SZ);
|
memcpy(end->lr_attr_scanstamp, xoap->xoa_av_scanstamp,
|
||||||
|
AV_SCANSTAMP_SZ);
|
||||||
} else if (XVA_ISSET_REQ(xvap, XAT_PROJID)) {
|
} else if (XVA_ISSET_REQ(xvap, XAT_PROJID)) {
|
||||||
/*
|
/*
|
||||||
* XAT_PROJID and XAT_AV_SCANSTAMP will never be valid
|
* XAT_PROJID and XAT_AV_SCANSTAMP will never be valid
|
||||||
* at the same time, so we can share the same space.
|
* at the same time, so we can share the same space.
|
||||||
*/
|
*/
|
||||||
memcpy(scanstamp, &xoap->xoa_projid, sizeof (uint64_t));
|
memcpy(end->lr_attr_scanstamp, &xoap->xoa_projid,
|
||||||
|
sizeof (uint64_t));
|
||||||
}
|
}
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_REPARSE))
|
if (XVA_ISSET_REQ(xvap, XAT_REPARSE))
|
||||||
*attrs |= (xoap->xoa_reparse == 0) ? 0 :
|
end->lr_attr_attrs |= (xoap->xoa_reparse == 0) ? 0 :
|
||||||
XAT0_REPARSE;
|
XAT0_REPARSE;
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_OFFLINE))
|
if (XVA_ISSET_REQ(xvap, XAT_OFFLINE))
|
||||||
*attrs |= (xoap->xoa_offline == 0) ? 0 :
|
end->lr_attr_attrs |= (xoap->xoa_offline == 0) ? 0 :
|
||||||
XAT0_OFFLINE;
|
XAT0_OFFLINE;
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_SPARSE))
|
if (XVA_ISSET_REQ(xvap, XAT_SPARSE))
|
||||||
*attrs |= (xoap->xoa_sparse == 0) ? 0 :
|
end->lr_attr_attrs |= (xoap->xoa_sparse == 0) ? 0 :
|
||||||
XAT0_SPARSE;
|
XAT0_SPARSE;
|
||||||
if (XVA_ISSET_REQ(xvap, XAT_PROJINHERIT))
|
if (XVA_ISSET_REQ(xvap, XAT_PROJINHERIT))
|
||||||
*attrs |= (xoap->xoa_projinherit == 0) ? 0 :
|
end->lr_attr_attrs |= (xoap->xoa_projinherit == 0) ? 0 :
|
||||||
XAT0_PROJINHERIT;
|
XAT0_PROJINHERIT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user