Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Factor uid, gid, and projid out of loop in zfs_write 

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Matt Macy <mmacy@FreeBSD.org>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #11176
This commit is contained in:
Ryan Moeller 2020-11-04 22:10:13 +00:00 committed by Brian Behlendorf
parent 3d40b65540
commit b3d723fb0e
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
module/zfs/zfs_vnops.c
View File

@ -337,6 +337,10 @@ zfs_write(znode_t *zp, uio_t *uio, int ioflag, cred_t *cr)
uint64_t end_size = MAX(zp->z_size, woff + n); uint64_t end_size = MAX(zp->z_size, woff + n);
zilog_t *zilog = zfsvfs->z_log; zilog_t *zilog = zfsvfs->z_log;
const uint64_t uid = KUID_TO_SUID(ZTOUID(zp));
const uint64_t gid = KGID_TO_SGID(ZTOGID(zp));
const uint64_t projid = zp->z_projid;
/* /*
* Write the file in reasonable size chunks. Each chunk is written * Write the file in reasonable size chunks. Each chunk is written
* in a separate transaction; this keeps the intent log records small * in a separate transaction; this keeps the intent log records small
@ -345,13 +349,11 @@ zfs_write(znode_t *zp, uio_t *uio, int ioflag, cred_t *cr)
while (n > 0) { while (n > 0) {
woff = uio->uio_loffset; woff = uio->uio_loffset;
if (zfs_id_overblockquota(zfsvfs, DMU_USERUSED_OBJECT, if (zfs_id_overblockquota(zfsvfs, DMU_USERUSED_OBJECT, uid) ||
KUID_TO_SUID(ZTOUID(zp))) || zfs_id_overblockquota(zfsvfs, DMU_GROUPUSED_OBJECT, gid) ||
zfs_id_overblockquota(zfsvfs, DMU_GROUPUSED_OBJECT, (projid != ZFS_DEFAULT_PROJID &&
KGID_TO_SGID(ZTOGID(zp))) ||
(zp->z_projid != ZFS_DEFAULT_PROJID &&
zfs_id_overblockquota(zfsvfs, DMU_PROJECTUSED_OBJECT, zfs_id_overblockquota(zfsvfs, DMU_PROJECTUSED_OBJECT,
zp->z_projid))) { projid))) {
error = SET_ERROR(EDQUOT); error = SET_ERROR(EDQUOT);
break; break;
} }
@ -515,7 +517,6 @@ zfs_write(znode_t *zp, uio_t *uio, int ioflag, cred_t *cr)
* user 0 is not an ephemeral uid. * user 0 is not an ephemeral uid.
*/ */
mutex_enter(&zp->z_acl_lock); mutex_enter(&zp->z_acl_lock);
uint32_t uid = KUID_TO_SUID(ZTOUID(zp));
if ((zp->z_mode & (S_IXUSR | (S_IXUSR >> 3) | if ((zp->z_mode & (S_IXUSR | (S_IXUSR >> 3) |
(S_IXUSR >> 6))) != 0 && (S_IXUSR >> 6))) != 0 &&
(zp->z_mode & (S_ISUID | S_ISGID)) != 0 && (zp->z_mode & (S_ISUID | S_ISGID)) != 0 &&