Page MenuHomeFreeBSD
Files F166349283

D45423.id139261.diff
No OneTemporary
Actions

D45423.id139261.diff
View Options

diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c
--- a/sys/ufs/ffs/ffs_snapshot.c
+++ b/sys/ufs/ffs/ffs_snapshot.c
@@ -790,8 +790,7 @@
*/
auio.uio_iov = &aiov;
auio.uio_iovcnt = 1;
- aiov.iov_base = (void *)snapblklist;
- aiov.iov_len = snaplistsize * sizeof(daddr_t);
+ IOVEC_INIT(&aiov, snapblklist, snaplistsize * sizeof(daddr_t));
auio.uio_resid = aiov.iov_len;
auio.uio_offset = lblktosize(fs, (off_t)numblks);
auio.uio_segflg = UIO_SYSSPACE;
@@ -2082,8 +2081,7 @@
*/
auio.uio_iov = &aiov;
auio.uio_iovcnt = 1;
- aiov.iov_base = (void *)&snaplistsize;
- aiov.iov_len = sizeof(snaplistsize);
+ IOVEC_INIT(&aiov, &snaplistsize, sizeof(snaplistsize));
auio.uio_resid = aiov.iov_len;
auio.uio_offset =
lblktosize(fs, howmany(fs->fs_size, fs->fs_frag));
@@ -2099,8 +2097,7 @@
snapblklist = malloc(snaplistsize * sizeof(daddr_t),
M_UFSMNT, M_WAITOK);
auio.uio_iovcnt = 1;
- aiov.iov_base = snapblklist;
- aiov.iov_len = snaplistsize * sizeof (daddr_t);
+ IOVEC_INIT(&aiov, snapblklist, snaplistsize * sizeof (daddr_t));
auio.uio_resid = aiov.iov_len;
auio.uio_offset -= sizeof(snaplistsize);
if ((error = VOP_READ(vp, &auio, IO_UNIT, td->td_ucred)) != 0) {
diff --git a/sys/ufs/ffs/ffs_suspend.c b/sys/ufs/ffs/ffs_suspend.c
--- a/sys/ufs/ffs/ffs_suspend.c
+++ b/sys/ufs/ffs/ffs_suspend.c
@@ -157,9 +157,7 @@
goto out;
break;
}
- uio->uio_iov[i].iov_base =
- (char *)uio->uio_iov[i].iov_base + len;
- uio->uio_iov[i].iov_len -= len;
+ IOVEC_ADVANCE(&uio->uio_iov[i], len);
uio->uio_resid -= len;
uio->uio_offset += len;
}
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -1354,8 +1354,7 @@
eae = malloc(easize, M_TEMP, M_WAITOK);
- liovec.iov_base = eae;
- liovec.iov_len = easize;
+ IOVEC_INIT(&liovec, eae, easize);
luio.uio_iov = &liovec;
luio.uio_iovcnt = 1;
luio.uio_offset = 0;
@@ -1482,11 +1481,10 @@
liovec = __builtin_alloca(lcnt * sizeof(struct iovec));
luio.uio_iovcnt = lcnt;
- liovec[0].iov_base = ip->i_ea_area;
- liovec[0].iov_len = ip->i_ea_len;
+ IOVEC_INIT(&liovec[0], ip->i_ea_area, ip->i_ea_len);
for (i = 1, tlen = ea_len - ip->i_ea_len; i < lcnt; i++) {
- liovec[i].iov_base = __DECONST(void *, zero_region);
- liovec[i].iov_len = MIN(ZERO_REGION_SIZE, tlen);
+ IOVEC_INIT(&liovec[i], __DECONST(void *, zero_region),
+ MIN(ZERO_REGION_SIZE, tlen));
tlen -= liovec[i].iov_len;
}
MPASS(tlen == 0);
diff --git a/sys/ufs/ufs/ufs_extattr.c b/sys/ufs/ufs/ufs_extattr.c
--- a/sys/ufs/ufs/ufs_extattr.c
+++ b/sys/ufs/ufs/ufs_extattr.c
@@ -397,8 +397,7 @@
while (!eofflag) {
auio.uio_resid = DIRBLKSIZ;
- aiov.iov_base = dirbuf;
- aiov.iov_len = DIRBLKSIZ;
+ IOVEC_INIT(&aiov, dirbuf, DIRBLKSIZ);
error = ufs_readdir(&vargs);
if (error) {
printf("ufs_extattr_iterate_directory: ufs_readdir "
@@ -625,8 +624,7 @@
auio.uio_iov = &aiov;
auio.uio_iovcnt = 1;
- aiov.iov_base = (caddr_t) &attribute->uele_fileheader;
- aiov.iov_len = sizeof(struct ufs_extattr_fileheader);
+ IOVEC_INIT_OBJ(&aiov, attribute->uele_fileheader);
auio.uio_resid = sizeof(struct ufs_extattr_fileheader);
auio.uio_offset = (off_t) 0;
auio.uio_segflg = UIO_SYSSPACE;
@@ -887,8 +885,7 @@
* how much.
*/
bzero(&ueh, sizeof(struct ufs_extattr_header));
- local_aiov.iov_base = (caddr_t) &ueh;
- local_aiov.iov_len = sizeof(struct ufs_extattr_header);
+ IOVEC_INIT_OBJ(&local_aiov, ueh);
local_aio.uio_iov = &local_aiov;
local_aio.uio_iovcnt = 1;
local_aio.uio_rw = UIO_READ;
@@ -1091,8 +1088,7 @@
ueh.ueh_len = uio->uio_resid;
ueh.ueh_flags = UFS_EXTATTR_ATTR_FLAG_INUSE;
ueh.ueh_i_gen = ip->i_gen;
- local_aiov.iov_base = (caddr_t) &ueh;
- local_aiov.iov_len = sizeof(struct ufs_extattr_header);
+ IOVEC_INIT_OBJ(&local_aiov, ueh);
local_aio.uio_iov = &local_aiov;
local_aio.uio_iovcnt = 1;
local_aio.uio_rw = UIO_WRITE;
@@ -1189,8 +1185,7 @@
*/
bzero(&ueh, sizeof(struct ufs_extattr_header));
- local_aiov.iov_base = (caddr_t) &ueh;
- local_aiov.iov_len = sizeof(struct ufs_extattr_header);
+ IOVEC_INIT_OBJ(&local_aiov, ueh);
local_aio.uio_iov = &local_aiov;
local_aio.uio_iovcnt = 1;
local_aio.uio_rw = UIO_READ;
@@ -1235,8 +1230,7 @@
ueh.ueh_flags = 0;
ueh.ueh_len = 0;
- local_aiov.iov_base = (caddr_t) &ueh;
- local_aiov.iov_len = sizeof(struct ufs_extattr_header);
+ IOVEC_INIT_OBJ(&local_aiov, ueh);
local_aio.uio_iov = &local_aiov;
local_aio.uio_iovcnt = 1;
local_aio.uio_rw = UIO_WRITE;
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -1230,8 +1230,7 @@
ASSERT_VOP_LOCKED(vp, "dqopen");
auio.uio_iov = &aiov;
auio.uio_iovcnt = 1;
- aiov.iov_base = &dqh;
- aiov.iov_len = sizeof(dqh);
+ IOVEC_INIT_OBJ(&aiov, dqh);
auio.uio_resid = sizeof(dqh);
auio.uio_offset = 0;
auio.uio_segflg = UIO_SYSSPACE;
@@ -1416,8 +1415,7 @@
}
auio.uio_iov = &aiov;
auio.uio_iovcnt = 1;
- aiov.iov_base = buf;
- aiov.iov_len = recsize;
+ IOVEC_INIT(&aiov, buf, recsize);
auio.uio_resid = recsize;
auio.uio_offset = base + id * recsize;
auio.uio_segflg = UIO_SYSSPACE;
@@ -1610,8 +1608,7 @@
auio.uio_iov = &aiov;
auio.uio_iovcnt = 1;
- aiov.iov_base = buf;
- aiov.iov_len = recsize;
+ IOVEC_INIT(&aiov, buf, recsize);
auio.uio_resid = recsize;
auio.uio_offset = base + dq->dq_id * recsize;
auio.uio_segflg = UIO_SYSSPACE;

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 14, 1:32 AM (2 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36694098
Default Alt Text
D45423.id139261.diff (5 KB)

Event Timeline