From nobody Sun Feb 11 01:52:45 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 4TXVwF3PFRz5969L; Sun, 11 Feb 2024 01:52:45 +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 4TXVwF2WrCz45T0; Sun, 11 Feb 2024 01:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707616365; 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=9IJuTkfE/7UMlVEoPfHiEY10PlI9TI56B7hGihQoSg8=; b=YS01jXSQa84wapnRd/6QUiKwRyEj7DKr7fztch6n5tsYUbjXth99boIh1ejW+jDfdNFuPe tCPRx0jH3L3JMcWXPIKIh5h7gvQluuy34JmoAGpJCAu2Q6hFNh8eOL2kfcUucdAqAaPSil vdQJzsleV8QRjEgvwfk8AU3MYzgU6I8lsKVDlEVMU+UseUUGmp4biiN/7/7mK7kd2/9L/u JrRzH4Ke/dWWkhnjHxQeiEW8JTX0wmtWDVuZuNTcgZpDsBO3bqwtJKxRhHLL2CmNdz2T88 zy1eMydRfIb176O9OSkiLle0Y3C2f4DhF5OwKGT4Q8cTv1ENWr0Kh01aznrCbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707616365; a=rsa-sha256; cv=none; b=ONrLp3xD3+UfoOZpkAZArIAi9lBeDAGerhEmYflla4PAe+2M4L+fixSs1gqqE+eLYhqMMZ HjRhbwn+Ekz3Bq5LLB7LYHvaqjeOg5RhNl7mjqoW5fAUDs0K+hHC/Ib7LBTXS2GUlIJC1c ffAfm1l8Co/wbT+GlhujIfpW/1Z7AWG26O2azMQ8DrQOamHNefSi3P39gLlQ0okYygPvj4 70t3XyS8nHp5FjJn+1W93N+R3AxhcEG+935L/0MDja39lI43Gg4q6165dBWlgFsN2/+Hcu YvzXV6Wct7IZCZ+JoNVIzffA5j2FMJw6FDmyGAyfHZ3Wh8eDPq6nqVs4uCZZ8g== 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=1707616365; 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=9IJuTkfE/7UMlVEoPfHiEY10PlI9TI56B7hGihQoSg8=; b=VF4akz4M2wAaWuKyFwc7YsTlFPocThEU7cGnoPlCXrPCYrW2U5w5fSRYjmpHWyTykEFWPP +RlKU6oaCLHPC8/8No7iXs1kKrzmZGwEJJKi1AZVWS8yzorAcYrxkKjpuUMZu7dWbxpQBo 7DmCibJu8Wgxc8v+Cq3xWjTIkuXaIYbhFjBfo64xDxrKS9KhEqu2LQKXciDKYkasAnYew2 6GwBpN0PCFKT6EwlgCfhIxKoF2RTCva8Zh7zzeOYty/0VNweczt0KyLhXj6WaZRaoffZKf 9BeZfSQjyfFnkJVJ+TsxYpaiweQXc0+Pu+jIfO4spflEv/IjcQPDMQgQyuVonA== 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 4TXVwF1Vnszgm6; Sun, 11 Feb 2024 01:52:45 +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 41B1qj6K089326; Sun, 11 Feb 2024 01:52:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41B1qj57089323; Sun, 11 Feb 2024 01:52:45 GMT (envelope-from git) Date: Sun, 11 Feb 2024 01:52:45 GMT Message-Id: <202402110152.41B1qj57089323@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: e4345a107bb4 - stable/13 - file: add fo_cmp method 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: e4345a107bb4492a9b43d45f5afc9d36061bee1a Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e4345a107bb4492a9b43d45f5afc9d36061bee1a commit e4345a107bb4492a9b43d45f5afc9d36061bee1a Author: Konstantin Belousov AuthorDate: 2024-01-19 21:01:35 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-11 01:40:29 +0000 file: add fo_cmp method (cherry picked from commit 168c7580c6328342945db0e19a0791466bb07624) --- sys/sys/file.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/sys/file.h b/sys/sys/file.h index ca8a229b994a..4b291459395f 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -128,6 +128,8 @@ typedef int fo_add_seals_t(struct file *fp, int flags); typedef int fo_get_seals_t(struct file *fp, int *flags); typedef int fo_fallocate_t(struct file *fp, off_t offset, off_t len, struct thread *td); +typedef int fo_cmp_t(struct file *fp, struct file *fp1, struct thread *td); +typedef int fo_spare_t(struct file *fp); typedef int fo_flags_t; struct fileops { @@ -149,6 +151,8 @@ struct fileops { fo_add_seals_t *fo_add_seals; fo_get_seals_t *fo_get_seals; fo_fallocate_t *fo_fallocate; + fo_cmp_t *fo_cmp; + fo_spare_t *fo_spares[7]; /* Spare slots */ fo_flags_t fo_flags; /* DFLAG_* below */ }; @@ -477,6 +481,15 @@ fo_fallocate(struct file *fp, off_t offset, off_t len, struct thread *td) return ((*fp->f_ops->fo_fallocate)(fp, offset, len, td)); } +static __inline int +fo_cmp(struct file *fp1, struct file *fp2, struct thread *td) +{ + + if (fp1->f_ops->fo_cmp == NULL) + return (ENODEV); + return ((*fp1->f_ops->fo_cmp)(fp1, fp2, td)); +} + #endif /* _KERNEL */ #endif /* !SYS_FILE_H */