From nobody Sat Jun 18 09:34:53 2022 X-Original-To: dev-commits-src-main@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 D6ECC863396; Sat, 18 Jun 2022 09:34:53 +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 4LQ9jn5h4cz4g8x; Sat, 18 Jun 2022 09:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655544893; 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=R2hanBsdKLyvapqtSgGLXpGtY+JL3OCim2+0E4gl6tk=; b=lR1nJra+vjqaKvYgrGJmWfIWwCPHD4OqJXovTs4LS3n4b3VWnrEiVYjs0qibvgzVEorIbJ IemWsbVjJ2z5gJ1o1ClZcySj6PCHmNRDkjQKevqVUGI1Ubcnxe8F1HCNgvIBej8c3WQJ+T HVl7P/qQvdjgdzsd2UFMangy38MYc5W+FJd1guecYnZitmg5s+qocMQEzYbMRhhubRmFOn iE7u7dKi0WhYTHKhcfzJT/yGAg2mhJWoUZRUJJ8Np5g6xppheB3D6bawzcC+c3o1DvzR/9 sloiep+9drRn01Co9Il+WqEphQADqw4x5mZA+qwFfFH3Qt8ofxzrzzL4c7Ey1A== 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 A33FB1238A; Sat, 18 Jun 2022 09:34:53 +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 25I9Yr9b056742; Sat, 18 Jun 2022 09:34:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25I9Yr4n056741; Sat, 18 Jun 2022 09:34:53 GMT (envelope-from git) Date: Sat, 18 Jun 2022 09:34:53 GMT Message-Id: <202206180934.25I9Yr4n056741@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8ae769491303 - main - KERN_LOCKF: report kl_file_fsid consistently with stat(2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8ae769491303715c68e79aaf0e4e2f5c639151f9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655544893; 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=R2hanBsdKLyvapqtSgGLXpGtY+JL3OCim2+0E4gl6tk=; b=jDtqORcCIPhFUyPYniWqvSH6nGEl7SoxYqjKVMb3/ZcWpypOU8turs9oBAdpDrvx0lzIE5 VyTwPWy42VxtoUG7WNlQ743noRuGDO3eHOW+ziQLSQtPspGd/nP0pQu0K6ykSGi0u5TzMh nmq3PFmmyzl0nVEq+DiNFsj9A+62DbMSv60glN7iFX5IdwxKz0QNmQaEn9ZtVPyekbsZWW 2VAStbMoMHv44bLrXTtmiY3MUfz/hi4SvvMHkn7mAcKBoJGwXlJayuj1NBlde4/6iXtx/F oNijbc4SpeK1vDZ0R+W8yt0FcDgJx4t+k3OIuZURNfO8jmZ13LLPeY3WtipJWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655544893; a=rsa-sha256; cv=none; b=xb27K0i2iZqwRMTjMytfnYuoUizChJkZ3UzTr/54Ss2h9s+wQQnOd82exdk9bqkSVsFmg/ 90ybucwGTPUWoFPE+IWNfDxw9IT5bPHjXr8fnXC0UZjnrg9O9SeKnt1cibyLY2ej7Pscfs Hag0R6/v6idxpfVyVcI4SkCgv9zHKMdMgoZY2V0Kh5N5gumnHXN7m8w0LcAS8a8VDQbhM0 KB+5921PO7FMtAMEqtY3yflV2Hnk9qCccGYok2caEZ/fGoK7sk5eq2L5zydRJq5doLDnWC 3/EL0W5pYMHG+r/J6h2Za65VlbkpnJNZi0PmVmsNk3NXcTC5w2fCIyNmLZZxdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8ae769491303715c68e79aaf0e4e2f5c639151f9 commit 8ae769491303715c68e79aaf0e4e2f5c639151f9 Author: Damjan Jovanovic AuthorDate: 2022-06-17 13:28:16 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-18 09:34:17 +0000 KERN_LOCKF: report kl_file_fsid consistently with stat(2) PR: 264723 Reviewed by: kib Discussed with: markj MFC after: 1 week --- 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 cad208197e76..98e29b2c9292 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; @@ -2532,8 +2530,7 @@ vfs_report_lockf(struct mount *mp, struct sbuf *sb) error = VOP_STAT(vp, &stt, ucred, NOCRED); 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;