The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=379bc98e0c0e7a3b14cef04803fb1debaa772ada
commit 379bc98e0c0e7a3b14cef04803fb1debaa772ada Author: Konstantin Belousov <[email protected]> AuthorDate: 2022-09-18 13:20:24 +0000 Commit: Konstantin Belousov <[email protected]> CommitDate: 2022-10-08 00:29:35 +0000 tmpfs_subr.c: some style (cherry picked from commit 0f01fb01c2de3e2c9ce8719750aea379c402ece6) --- sys/fs/tmpfs/tmpfs_subr.c | 67 +++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index 84ee857340f6..6c8d9bd9a0ff 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -120,7 +120,8 @@ tmpfs_pager_writecount_recalc(vm_object_t object, vm_offset_t old, */ if (vp == NULL) { KASSERT((object->flags & OBJ_TMPFS_VREF) == 0, - ("object %p with OBJ_TMPFS_VREF but without vnode", object)); + ("object %p with OBJ_TMPFS_VREF but without vnode", + object)); VM_OBJECT_WUNLOCK(object); return; } @@ -131,7 +132,8 @@ tmpfs_pager_writecount_recalc(vm_object_t object, vm_offset_t old, VNPASS(vp->v_usecount > 0, vp); } else { VNASSERT((object->flags & OBJ_TMPFS_VREF) != 0, vp, - ("object with writable mappings does not have a reference")); + ("object with writable mappings does not " + "have a reference")); } if (old == new) { @@ -534,11 +536,13 @@ tmpfs_alloc_node(struct mount *mp, struct tmpfs_mount *tmp, enum vtype type, symlink = NULL; if (!tmp->tm_nonc) { - symlink = cache_symlink_alloc(nnode->tn_size + 1, M_WAITOK); + symlink = cache_symlink_alloc(nnode->tn_size + 1, + M_WAITOK); symlink_smr = true; } if (symlink == NULL) { - symlink = malloc(nnode->tn_size + 1, M_TMPFSNAME, M_WAITOK); + symlink = malloc(nnode->tn_size + 1, M_TMPFSNAME, + M_WAITOK); symlink_smr = false; } memcpy(symlink, target, nnode->tn_size + 1); @@ -550,14 +554,15 @@ tmpfs_alloc_node(struct mount *mp, struct tmpfs_mount *tmp, enum vtype type, * 1. nnode is not yet visible to the world * 2. both tn_link_target and tn_link_smr get populated * 3. release fence publishes their content - * 4. tn_link_target content is immutable until node destruction, - * where the pointer gets set to NULL + * 4. tn_link_target content is immutable until node + * destruction, where the pointer gets set to NULL * 5. tn_link_smr is never changed once set * - * As a result it is sufficient to issue load consume on the node - * pointer to also get the above content in a stable manner. - * Worst case tn_link_smr flag may be set to true despite being stale, - * while the target buffer is already cleared out. + * As a result it is sufficient to issue load consume + * on the node pointer to also get the above content + * in a stable manner. Worst case tn_link_smr flag + * may be set to true despite being stale, while the + * target buffer is already cleared out. */ atomic_store_ptr(&nnode->tn_link_target, symlink); atomic_store_char((char *)&nnode->tn_link_smr, symlink_smr); @@ -635,9 +640,10 @@ tmpfs_free_node_locked(struct tmpfs_mount *tmp, struct tmpfs_node *node, MPASS((node->tn_vpstate & TMPFS_VNODE_ALLOCATING) == 0); /* - * Make sure this is a node type we can deal with. Everything is explicitly - * enumerated without the 'default' clause so the compiler can throw an - * error in case a new type is added. + * Make sure this is a node type we can deal with. Everything + * is explicitly enumerated without the 'default' clause so + * the compiler can throw an error in case a new type is + * added. */ switch (node->tn_type) { case VBLK: @@ -651,17 +657,16 @@ tmpfs_free_node_locked(struct tmpfs_mount *tmp, struct tmpfs_node *node, case VNON: case VBAD: case VMARKER: - panic("%s: bad type %d for node %p", __func__, (int)node->tn_type, node); + panic("%s: bad type %d for node %p", __func__, + (int)node->tn_type, node); } #endif switch (node->tn_type) { case VREG: uobj = node->tn_reg.tn_aobj; - if (uobj != NULL) { - if (uobj->size != 0) - atomic_subtract_long(&tmp->tm_pages_used, uobj->size); - } + if (uobj != NULL && uobj->size != 0) + atomic_subtract_long(&tmp->tm_pages_used, uobj->size); tmpfs_free_tmp(tmp); @@ -1807,7 +1812,7 @@ tmpfs_check_mtime(struct vnode *vp) */ int tmpfs_chflags(struct vnode *vp, u_long flags, struct ucred *cred, - struct thread *p) + struct thread *td) { int error; struct tmpfs_node *node; @@ -1830,7 +1835,7 @@ tmpfs_chflags(struct vnode *vp, u_long flags, struct ucred *cred, * Callers may only modify the file flags on objects they * have VADMIN rights for. */ - if ((error = VOP_ACCESS(vp, VADMIN, cred, p))) + if ((error = VOP_ACCESS(vp, VADMIN, cred, td))) return (error); /* * Unprivileged processes are not permitted to unset system @@ -1863,7 +1868,8 @@ tmpfs_chflags(struct vnode *vp, u_long flags, struct ucred *cred, * The vnode must be locked on entry and remain locked on exit. */ int -tmpfs_chmod(struct vnode *vp, mode_t mode, struct ucred *cred, struct thread *p) +tmpfs_chmod(struct vnode *vp, mode_t mode, struct ucred *cred, + struct thread *td) { int error; struct tmpfs_node *node; @@ -1886,7 +1892,7 @@ tmpfs_chmod(struct vnode *vp, mode_t mode, struct ucred *cred, struct thread *p) * To modify the permissions on a file, must possess VADMIN * for that file. */ - if ((error = VOP_ACCESS(vp, VADMIN, cred, p))) + if ((error = VOP_ACCESS(vp, VADMIN, cred, td))) return (error); /* @@ -1924,7 +1930,7 @@ tmpfs_chmod(struct vnode *vp, mode_t mode, struct ucred *cred, struct thread *p) */ int tmpfs_chown(struct vnode *vp, uid_t uid, gid_t gid, struct ucred *cred, - struct thread *p) + struct thread *td) { int error; struct tmpfs_node *node; @@ -1957,7 +1963,7 @@ tmpfs_chown(struct vnode *vp, uid_t uid, gid_t gid, struct ucred *cred, * To modify the ownership of a file, must possess VADMIN for that * file. */ - if ((error = VOP_ACCESS(vp, VADMIN, cred, p))) + if ((error = VOP_ACCESS(vp, VADMIN, cred, td))) return (error); /* @@ -1978,7 +1984,8 @@ tmpfs_chown(struct vnode *vp, uid_t uid, gid_t gid, struct ucred *cred, node->tn_status |= TMPFS_NODE_CHANGED; - if ((node->tn_mode & (S_ISUID | S_ISGID)) && (ouid != uid || ogid != gid)) { + if ((node->tn_mode & (S_ISUID | S_ISGID)) != 0 && + (ouid != uid || ogid != gid)) { if (priv_check_cred(cred, PRIV_VFS_RETAINSUGID)) { newmode = node->tn_mode & ~(S_ISUID | S_ISGID); atomic_store_short(&node->tn_mode, newmode); @@ -1997,7 +2004,7 @@ tmpfs_chown(struct vnode *vp, uid_t uid, gid_t gid, struct ucred *cred, */ int tmpfs_chsize(struct vnode *vp, u_quad_t size, struct ucred *cred, - struct thread *p) + struct thread *td) { int error; struct tmpfs_node *node; @@ -2056,7 +2063,7 @@ tmpfs_chsize(struct vnode *vp, u_quad_t size, struct ucred *cred, */ int tmpfs_chtimes(struct vnode *vp, struct vattr *vap, - struct ucred *cred, struct thread *l) + struct ucred *cred, struct thread *td) { int error; struct tmpfs_node *node; @@ -2073,21 +2080,17 @@ tmpfs_chtimes(struct vnode *vp, struct vattr *vap, if (node->tn_flags & (IMMUTABLE | APPEND)) return (EPERM); - error = vn_utimes_perm(vp, vap, cred, l); + error = vn_utimes_perm(vp, vap, cred, td); if (error != 0) return (error); if (vap->va_atime.tv_sec != VNOVAL) node->tn_accessed = true; - if (vap->va_mtime.tv_sec != VNOVAL) node->tn_status |= TMPFS_NODE_MODIFIED; - if (vap->va_birthtime.tv_sec != VNOVAL) node->tn_status |= TMPFS_NODE_MODIFIED; - tmpfs_itimes(vp, &vap->va_atime, &vap->va_mtime); - if (vap->va_birthtime.tv_sec != VNOVAL) node->tn_birthtime = vap->va_birthtime; ASSERT_VOP_ELOCKED(vp, "chtimes2");
