From nobody Sun Feb 11 01:52:50 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 4TXVwM2br0z596GM; Sun, 11 Feb 2024 01:52:51 +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 4TXVwM04TNz45jC; Sun, 11 Feb 2024 01:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707616371; 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=MQ+5cDB0xR9Cu+CqTamLLIFVLDUjSkzFeCdR/AtufU8=; b=a/E0e9QUOKoewTPDt8UP6BY+GF8lkyiYkBdbdfd+TyM9sM4vcAV+nEBFf4kIEbN79fQI6h zQZKRMNwsyDna7IEqbS7TvVF/IBAizULW71hg0Kld9r6iPs+Jv8aPuFqwSVSd75TDFRZ++ xyb19SOTBm/5fOP9RrRfjcxkG2287Wyu+LHBT/DGHsnCpawjzkgLzzjKARoacLR77VfAXN 8ZFmIy3do5PnjiLBVp7V0NkZ+WzKpyKlFQJgB2icR7TutOVK/yFY9OTRW2S9CujnhJt+v4 aGFSKZ63k+pE8JlbpziFDiXPfStfqdgj3lwuQW3PojNUrQ90OZO8d0cWeToN3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707616371; a=rsa-sha256; cv=none; b=Q/KgwnryGqOYg/m9ZCsPgFoM5RRd3MifVaIpQQtUzQGYcmaI6Mg2xrn+IptrYquD/z+grH Hzo5zdcF+bGcBP4X1Hf0FzNF9hJI79Nsdmp1n2NiS5PeeNFOwS1B6PTsMvx9+Q6j8bta61 GB0FreubPIel3F77Br2nJR00TKRchREkcsQKLwPivVOUTuAcnsMzhkg0lAllaD/Kz2XHkc DxbWGwbX9CSCB+8J5dZqRcZ+NK13E8/2yE8PEf9jC5QeCFUTimV/hOrONx6ARq2UkK6sMb acjBsNHw90ImTBlmCBNuVPZ1UF3eBz9LJ4Gzbqzuklag6ftrzCPGfPjmVpGqbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707616371; 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=MQ+5cDB0xR9Cu+CqTamLLIFVLDUjSkzFeCdR/AtufU8=; b=XVDvPzDvMjmkjDf+xYbyqt2eSyoB+66HBsWh8+na7lPn3dhRwfHYu2kXKhFo2xS3+naepq DlDH9wmPtMYPkPAjhrKZc4tcXxMYiOXIDvvFMehjgTjROaedYPXdMYVW5BpoHsXijc8fgq yW69npDndyxQqPLeCYXKPlpa81IOs4T/VwYU/QCL3VanhtfCeQCeI+djoP7EXQpj5cBxaV r5K403TsWAGtkvU7DWpy6ZZYfX7d6VWObo10FduiNAVYDmLWGqZsVCRW9X7ohokSVAnNgZ E4xt+8zHLMFmQ78GLE1YdVis60fcm5DWB1kLqEmjiHdOr2m1SXquOG/spex7Qg== 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 4TXVwL6HKwzgxw; Sun, 11 Feb 2024 01:52:50 +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 41B1qoAJ089561; Sun, 11 Feb 2024 01:52:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41B1qoRF089558; Sun, 11 Feb 2024 01:52:50 GMT (envelope-from git) Date: Sun, 11 Feb 2024 01:52:50 GMT Message-Id: <202402110152.41B1qoRF089558@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: 81d146d078e9 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 81d146d078e94707af2ed13bce6e42c0518e77b7 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=81d146d078e94707af2ed13bce6e42c0518e77b7 commit 81d146d078e94707af2ed13bce6e42c0518e77b7 Author: Konstantin Belousov AuthorDate: 2024-01-19 21:24:31 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-11 01:40:29 +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 0a28f47bccdf..f51a1092114d 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -5305,6 +5305,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 d2df3e2c5e4d..e095fb9df13b 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -123,6 +123,7 @@ struct fileops vnops = { .fo_fill_kinfo = vn_fill_kinfo, .fo_mmap = vn_mmap, .fo_fallocate = vn_fallocate, + .fo_cmp = vn_cmp, .fo_flags = DFLAG_PASSABLE | DFLAG_SEEKABLE }; @@ -4064,3 +4065,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 fb7c446d7ee0..196965eba9a3 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -804,6 +804,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,