From nobody Wed Jan 31 00:46:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPjyX5QX9z580dM; Wed, 31 Jan 2024 00:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TPjyX0pbdz45dZ; Wed, 31 Jan 2024 00:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oKNKlXuTALxa/rRS/rKV6eta6y9nm68YMNyVDyTZPRo=; b=YtqY+0HxtrXipE37qbyZL+13cLYmygjt3nb8qyV04p0bu+2i5IpE/8WqIezNe5QWKsiB3G hgNzjPqCyp4iRJEN7TpSgYWegfOIV2UmY0/Q/wJDnAiwu2YaYFDRN5RdPbGp9BVkq5T4WT 6msAlXXOmDMbgapW6PTaC6gcUL7au7OV36dhwAki6Lwcq2guNf3RQ7uJdCVyw1UMySiKA9 p2N0rrm9AopbUFYjoE/OVIGMgCA4m9vJP4vlxQmlPqLjrGnjB7Rz3Qa+o6uUXuKSTIa6eP 7mJD7Y9z3oZJ80dauBj5O38himDxew/hrOZWD6MgJ2ZwKuaUxtyTLifzmg7wAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oKNKlXuTALxa/rRS/rKV6eta6y9nm68YMNyVDyTZPRo=; b=SMBPvA7miscAB5K3dgKIYecfC8gFw3jqz6LvfcFTJy5RrZqnH/vYIjDS57VfRj5+bPr8AS IpKq4aU20ruFieAhJUM+kBIahm4yPyyRMSIregSj6nYWQeUkOzQ8H7Z74lBSAyl2BErOZt pWvLMmOysPAqjG9DYjooCHDmWeywWELTWddCsE6YRYKG1/4kUg9LHKTmdnsKLJFsImEcGj aP/D88Ui22PuJgb+XCsKgvJYuXTztoJpUotmmyC8q2V1CrIjupJOSC3VQDjPiNt24i89di ilavSj2FZDXgnKsXRZxlvOaDnq7Tx/0KqT+yE+6YImWhINKhJmL0/QxJr1pf+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706661972; a=rsa-sha256; cv=none; b=DMh+f6eUHHzrxxOy6cb7KGNmNqYfTy2ouI22qHdrnze0DShfYMOZq7bdlWcSKvu/j2lOjU FdgAXPPHGDczhEA+BOP+askgxaZjivsUWJFGaux0al7zUKqa0cHXDxPUXtgxUjjVaGnebZ bTAoVIrzhQw7qAKId7eH/uDW7ecuXAJbdbVI4Iw65jlUA6KhcTwiwan0VrMvRYBV2N9d5I ZAn6IcpcCAFMC31ylpOzxuRKrcOg7q9lvxG6Fk5d6/Wa12TQx3QExlH1k/qzcj8Yjh/MkP /Pd6GIMbv8A+LlcjzE5tpFTYrOXQ6z+MM8mBN1XotvR+gmdih6jYuRMSzeb1Gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPjyW6tBQzxVs; Wed, 31 Jan 2024 00:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40V0kBLh063542; Wed, 31 Jan 2024 00:46:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40V0kBVq063539; Wed, 31 Jan 2024 00:46:11 GMT (envelope-from git) Date: Wed, 31 Jan 2024 00:46:11 GMT Message-Id: <202401310046.40V0kBVq063539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 098500b79e17 - stable/14 - kcmp(2): implement for vnode files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 098500b79e1734f269743eabb624c854804c67ac Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=098500b79e1734f269743eabb624c854804c67ac commit 098500b79e1734f269743eabb624c854804c67ac Author: Konstantin Belousov AuthorDate: 2024-01-19 21:24:31 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-30 20:24:42 +0000 kcmp(2): implement for vnode files (cherry picked from commit f04220c1b0641fa68d01dc85d9fef706b02f4079) --- sys/kern/kern_descrip.c | 1 + sys/kern/vfs_vnops.c | 9 +++++++++ sys/sys/vnode.h | 1 + 3 files changed, 11 insertions(+) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 7bb392eee6b2..30d82f74d725 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -5287,6 +5287,7 @@ struct fileops path_fileops = { .fo_chown = badfo_chown, .fo_sendfile = badfo_sendfile, .fo_fill_kinfo = vn_fill_kinfo, + .fo_cmp = vn_cmp, .fo_flags = DFLAG_PASSABLE, }; diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 50f202d6ea1a..b650b32ccc55 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -125,6 +125,7 @@ struct fileops vnops = { .fo_mmap = vn_mmap, .fo_fallocate = vn_fallocate, .fo_fspacectl = vn_fspacectl, + .fo_cmp = vn_cmp, .fo_flags = DFLAG_PASSABLE | DFLAG_SEEKABLE }; @@ -4230,3 +4231,11 @@ vn_lktype_write(struct mount *mp, struct vnode *vp) return (LK_SHARED); return (LK_EXCLUSIVE); } + +int +vn_cmp(struct file *fp1, struct file *fp2, struct thread *td) +{ + if (fp2->f_type != DTYPE_VNODE) + return (3); + return (kcmp_cmp((uintptr_t)fp1->f_vnode, (uintptr_t)fp2->f_vnode)); +} diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 07b1a419b916..2667b77d7c52 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -820,6 +820,7 @@ int vn_vget_ino_gen(struct vnode *vp, vn_get_ino_t alloc, void *alloc_arg, int lkflags, struct vnode **rvp); int vn_utimes_perm(struct vnode *vp, struct vattr *vap, struct ucred *cred, struct thread *td); +int vn_cmp(struct file *, struct file *, struct thread *td); int vn_io_fault_uiomove(char *data, int xfersize, struct uio *uio); int vn_io_fault_pgmove(vm_page_t ma[], vm_offset_t offset, int xfersize,