The lockmgr_printinfo() function has been replaced with a dysfunctional
stub in May 2013 and doesn't seem to have been missed thereafter. I
would like to kill that stub to remove clutter from the (already hard to
understand) filesystem implementations.

Ok?

natano


Index: isofs/udf/udf_vnops.c
===================================================================
RCS file: /cvs/src/sys/isofs/udf/udf_vnops.c,v
retrieving revision 1.60
diff -u -p -u -r1.60 udf_vnops.c
--- isofs/udf/udf_vnops.c       14 Mar 2015 03:38:50 -0000      1.60
+++ isofs/udf/udf_vnops.c       19 Sep 2015 18:54:47 -0000
@@ -935,7 +935,6 @@ udf_print(void *v)
         */
        printf("tag VT_UDF, hash id %u\n", up->u_ino);
 #ifdef DIAGNOSTIC
-       lockmgr_printinfo(&up->u_lock);
        printf("\n");
 #endif
        return (0);
Index: miscfs/fuse/fuse_vnops.c
===================================================================
RCS file: /cvs/src/sys/miscfs/fuse/fuse_vnops.c,v
retrieving revision 1.24
diff -u -p -u -r1.24 fuse_vnops.c
--- miscfs/fuse/fuse_vnops.c    17 Apr 2015 04:43:21 -0000      1.24
+++ miscfs/fuse/fuse_vnops.c    19 Sep 2015 18:54:47 -0000
@@ -874,7 +874,6 @@ fusefs_print(void *v)
 
        /* Complete the information given by vprint(). */
        printf("tag VT_FUSE, hash id %u ", ip->ufs_ino.i_number);
-       lockmgr_printinfo(&ip->ufs_ino.i_lock);
        printf("\n");
        return (0);
 }
Index: msdosfs/msdosfs_vnops.c
===================================================================
RCS file: /cvs/src/sys/msdosfs/msdosfs_vnops.c,v
retrieving revision 1.100
diff -u -p -u -r1.100 msdosfs_vnops.c
--- msdosfs/msdosfs_vnops.c     17 Apr 2015 04:43:21 -0000      1.100
+++ msdosfs/msdosfs_vnops.c     19 Sep 2015 18:54:47 -0000
@@ -1833,7 +1833,6 @@ msdosfs_print(void *v)
            major(dep->de_dev), minor(dep->de_dev),
            VOP_ISLOCKED(ap->a_vp) ? "(LOCKED)" : "");
 #ifdef DIAGNOSTIC
-       lockmgr_printinfo(&dep->de_lock);
        printf("\n");
 #endif
 
Index: sys/lock.h
===================================================================
RCS file: /cvs/src/sys/sys/lock.h,v
retrieving revision 1.25
diff -u -p -u -r1.25 lock.h
--- sys/lock.h  11 Feb 2015 07:22:15 -0000      1.25
+++ sys/lock.h  19 Sep 2015 18:54:47 -0000
@@ -61,6 +61,4 @@ void  lockinit(struct lock *, int, char *
 int    lockmgr(struct lock *, u_int flags, void *);
 int    lockstatus(struct lock *);
 
-#define        lockmgr_printinfo(lkp)
-
 #endif /* !_LOCK_H_ */
Index: ufs/ufs/ufs_vnops.c
===================================================================
RCS file: /cvs/src/sys/ufs/ufs/ufs_vnops.c,v
retrieving revision 1.121
diff -u -p -u -r1.121 ufs_vnops.c
--- ufs/ufs/ufs_vnops.c 17 Apr 2015 04:43:21 -0000      1.121
+++ ufs/ufs/ufs_vnops.c 19 Sep 2015 18:54:47 -0000
@@ -1648,7 +1648,6 @@ ufs_print(void *v)
        if (vp->v_type == VFIFO)
                fifo_printinfo(vp);
 #endif /* FIFO */
-       lockmgr_printinfo(&ip->i_lock);
        printf("\n");
 
 #endif /* DIAGNOSTIC */

Reply via email to