d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KERN_LOCKF: report kl_file_fsid consistently with stat(2)

Browse Source 
PR:	264723
Reviewed by:	kib
Discussed with:	markj
MFC after:	1 week
This commit is contained in:
Damjan Jovanovic 2022-06-17 16:28:16 +03:00 committed by Konstantin Belousov
parent 4014365e42
commit 8ae7694913
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/kern/kern_lockf.c
View File

@ -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;