From nobody Sat Jun 25 05:02:03 2022 X-Original-To: dev-commits-src-branches@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 2045F85DE53; Sat, 25 Jun 2022 05:02:04 +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 4LVMKm04n6z4Zg5; Sat, 25 Jun 2022 05:02:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656133324; 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=ocnTmcPUxwwIZLEjPbMNvrvOqcUTAiNTpzO4UH0m7QI=; b=JK1jHvGP90NPjulDnEx15jljVmzP0DvtlAJppx1dKhtZMWqM3+v7FBgAK4Kha6entBdVSS E9+IvO0EdmOHWWJ7P8+eCzKb2qF5FOh1+FU2izenEHxa7QpmAhK3JwdbRLod2QJ2xLk9n6 o+/t0QTCIyHpjEdxsfLoVm1B3NxtTF7WeLtLjlcQk8kNgN0tUZx5MXdUvVZpBGTrfABUfc u11K40f+6Pxi+DW4wpQUiikhkuyNIRytJs/PlKkwcXSfLtMjtjE8jAFc30X/PxTmMfpvwN GjH/7EFfc5u/+J/zddv0lqV1ghRIWocAV5tubr8/1tK4sc68VU8yi1T3D39ucw== 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 D85041E1A2; Sat, 25 Jun 2022 05:02:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25P523Go061101; Sat, 25 Jun 2022 05:02:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25P5230j061100; Sat, 25 Jun 2022 05:02:03 GMT (envelope-from git) Date: Sat, 25 Jun 2022 05:02:03 GMT Message-Id: <202206250502.25P5230j061100@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: c1731fa54dd1 - stable/13 - KERN_LOCKF: report kl_file_fsid consistently with stat(2) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: c1731fa54dd1eec310729e81e18dd601201405dc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656133324; 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=ocnTmcPUxwwIZLEjPbMNvrvOqcUTAiNTpzO4UH0m7QI=; b=iF//3TdiO4dDTBOdChE+0VAf7ACCTNcWGgXGnbgpr4pvtGVuVm5Q5Kz2Rzgc4bsf263ckI Oj5kBObSOQxPet5e8BHD0bgyIBOpLIClU147efDDWzeen4h0BVyyzqkosuenyUPq90iIIB PfpJMFX+jWujfMa9xfb9rhOg43N/KEQVWca4gCda81u7yowzsMMwfNTWFZyjDtuPNyQaJB 1m+oUx/kxXnCTq5YqhNuB2j/EuptMEjm+YCNh7z8O2QooGJHAXklo6kVo0v+QcBPL7Rgyb R5R96qnnzFOo+xvhJ/qCkhD+RFCWOhsTm8ZgOeybnubWRJgtZt8bmasLZgxh/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656133324; a=rsa-sha256; cv=none; b=KTrPGRNdlfbXcPWcFk0RMWW+RAkUsdEWr8b5yispDpst8+GrgW7xKAbTX/vUu3O69z4lxR +dlaF6Ng66nGhu6Vg/HPUAy5tR0qNNE0AxmVskXrcJ7SeSjZpwWY7YuLAxWTv8chvBG9u8 ibTTjZljfpiDX4bOa5wQk9CclEFD/f3dWk/qpp3wdfb6MlrW00wdmxUTFF3yubo8GY0Hwb kAYMC+KRKd5U8/pnu/qqwJ+BazVTeQVS07qxodbapdn9bkKjeGbc2kS8ilJbLl/h/4Q6oZ SwirTzcBafwbqrYVj64RVMUXGV1Re74r3B1KO8fxx/dIVmG1zfurfSy8WNRrTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c1731fa54dd1eec310729e81e18dd601201405dc commit c1731fa54dd1eec310729e81e18dd601201405dc Author: Damjan Jovanovic AuthorDate: 2022-06-17 13:28:16 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-24 19:37:33 +0000 KERN_LOCKF: report kl_file_fsid consistently with stat(2) PR: 264723 (cherry picked from commit 8ae769491303715c68e79aaf0e4e2f5c639151f9) --- sys/kern/kern_lockf.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c index f1a432e66bd8..52c603949bdc 100644 --- a/sys/kern/kern_lockf.c +++ b/sys/kern/kern_lockf.c @@ -2479,7 +2479,6 @@ vfs_report_lockf(struct mount *mp, struct sbuf *sb) struct ucred *ucred; char *fullpath, *freepath; struct stat stt; - fsid_t fsidx; STAILQ_HEAD(, kinfo_lockf_linked) locks; int error, gerror; @@ -2522,7 +2521,6 @@ vfs_report_lockf(struct mount *mp, struct sbuf *sb) gerror = 0; ucred = curthread->td_ucred; - fsidx = mp->mnt_stat.f_fsid; while ((klf = STAILQ_FIRST(&locks)) != NULL) { STAILQ_REMOVE_HEAD(&locks, link); vp = klf->vp; @@ -2533,8 +2531,7 @@ vfs_report_lockf(struct mount *mp, struct sbuf *sb) curthread); VOP_UNLOCK(vp); if (error == 0) { - memcpy(&klf->kl.kl_file_fsid, &fsidx, - sizeof(fsidx)); + klf->kl.kl_file_fsid = stt.st_dev; klf->kl.kl_file_rdev = stt.st_rdev; klf->kl.kl_file_fileid = stt.st_ino; freepath = NULL;