svn commit: r306739 - stable/11/sys/kern
John Baldwin
jhb at FreeBSD.org
Wed Oct 5 22:26:50 UTC 2016
Author: jhb
Date: Wed Oct 5 22:26:48 2016
New Revision: 306739
URL: https://svnweb.freebsd.org/changeset/base/306739
Log:
MFC 305922: Fix LINT building.
Modified:
stable/11/sys/kern/kern_lockf.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/kern/kern_lockf.c
==============================================================================
--- stable/11/sys/kern/kern_lockf.c Wed Oct 5 22:04:22 2016 (r306738)
+++ stable/11/sys/kern/kern_lockf.c Wed Oct 5 22:26:48 2016 (r306739)
@@ -83,7 +83,9 @@ __FBSDID("$FreeBSD$");
#ifdef LOCKF_DEBUG
#include <sys/sysctl.h>
+#include <ufs/ufs/extattr.h>
#include <ufs/ufs/quota.h>
+#include <ufs/ufs/ufsmount.h>
#include <ufs/ufs/inode.h>
static int lockf_debug = 0; /* control debug output */
@@ -2500,7 +2502,7 @@ lf_print(char *tag, struct lockf_entry *
if (lock->lf_inode != (struct inode *)0)
printf(" in ino %ju on dev <%s>,",
(uintmax_t)lock->lf_inode->i_number,
- devtoname(lock->lf_inode->i_dev));
+ devtoname(ITODEV(lock->lf_inode)));
printf(" %s, start %jd, end ",
lock->lf_type == F_RDLCK ? "shared" :
lock->lf_type == F_WRLCK ? "exclusive" :
@@ -2528,7 +2530,7 @@ lf_printlist(char *tag, struct lockf_ent
printf("%s: Lock list for ino %ju on dev <%s>:\n",
tag, (uintmax_t)lock->lf_inode->i_number,
- devtoname(lock->lf_inode->i_dev));
+ devtoname(ITODEV(lock->lf_inode)));
LIST_FOREACH(lf, &lock->lf_vnode->v_lockf->ls_active, lf_link) {
printf("\tlock %p for ",(void *)lf);
lf_print_owner(lock->lf_owner);
More information about the svn-src-stable-11
mailing list