From: zrj <rimvydas.jasinskas@gmail.com>
Date: Sat, 6 Apr 2019 20:04:59 +0000 (+0300)
Subject: fstat(1): Mangle dev2udev() name.
X-Git-Tag: v5.7.0~347
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/a9871e482329e3ee474d306e0ca9e17e96a2c0df

fstat(1): Mangle dev2udev() name.

Avoid symbol conflicts with libkvm internal one.
---

diff --git a/usr.bin/fstat/cd9660.c b/usr.bin/fstat/cd9660.c
index 55d5d31ad2..831fb089cb 100644
--- a/usr.bin/fstat/cd9660.c
+++ b/usr.bin/fstat/cd9660.c
@@ -63,7 +63,7 @@ isofs_filestat(struct vnode *vp, struct filestat *fsp)
 		    (void *)VTOI(vp), Pid);
 		return 0;
 	}
-	fsp->fsid = fsp->rdev = dev2udev(isonode.i_dev);
+	fsp->fsid = fsp->rdev = fstat_dev2udev(isonode.i_dev);
 	fsp->mode = (mode_t)isonode.inode.iso_mode;
 	fsp->fileid = (long)isonode.i_number;
 	fsp->size = isonode.i_size;
diff --git a/usr.bin/fstat/ext2fs.c b/usr.bin/fstat/ext2fs.c
index 5d0f21fcc3..35dbdef02e 100644
--- a/usr.bin/fstat/ext2fs.c
+++ b/usr.bin/fstat/ext2fs.c
@@ -52,7 +52,7 @@ ext2fs_filestat(struct vnode *vp, struct filestat *fsp)
 		return 0;
 	}
 	fsp->mode = ino.i_mode | mtrans(vp->v_type);
-	fsp->rdev = fsp->fsid = dev2udev(ino.i_dev);
+	fsp->rdev = fsp->fsid = fstat_dev2udev(ino.i_dev);
 	fsp->size = ino.i_din.di_size;
 	fsp->fileid = ino.i_number;
 
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index 7b84386bdc..0bc51e310c 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -594,7 +594,7 @@ ufs_filestat(struct vnode *vp, struct filestat *fsp)
 	 * contain dev_t structures. We need to convert to udev to make
 	 * comparisons
 	 */
-	fsp->fsid = dev2udev(inode.i_dev);
+	fsp->fsid = fstat_dev2udev(inode.i_dev);
 	fsp->fileid = (long)inode.i_number;
 	fsp->mode = (mode_t)inode.i_mode;
 	fsp->size = inode.i_size;
@@ -633,7 +633,7 @@ devfs_filestat(struct vnode *vp, struct filestat *fsp)
 		    (void *)vp->v_data, Pid);
 		return 0;
 	}
-	fsp->fsid = fsp->rdev = dev2udev(vp->v_rdev);
+	fsp->fsid = fsp->rdev = fstat_dev2udev(vp->v_rdev);
 	fsp->fileid = devfs_node.d_dir.d_ino;
 	fsp->mode = (devfs_node.mode & ~S_IFMT) | S_IFCHR;
 	fsp->size = 0;
@@ -913,7 +913,7 @@ bad:
  * in order to work out the associated udev_t
  */
 udev_t
-dev2udev(void *dev)
+fstat_dev2udev(void *dev)
 {
 	struct cdev si;
 
diff --git a/usr.bin/fstat/fstat.h b/usr.bin/fstat/fstat.h
index 4c4b82e3a5..963a3fc3d7 100644
--- a/usr.bin/fstat/fstat.h
+++ b/usr.bin/fstat/fstat.h
@@ -78,9 +78,7 @@ extern kvm_t *kd;
 extern int vflg;
 extern int Pid;
 
-/* XXX symbol conflict with libkvm.a */
-#define	dev2udev fstat_dev2udev
-udev_t dev2udev(void *);
+udev_t fstat_dev2udev(void *);
 udev_t makeudev(int, int);
 
 /* Additional filesystem types */
diff --git a/usr.bin/fstat/hammer.c b/usr.bin/fstat/hammer.c
index d14f8ad297..95c9f4a254 100644
--- a/usr.bin/fstat/hammer.c
+++ b/usr.bin/fstat/hammer.c
@@ -67,6 +67,6 @@ hammer_filestat(struct vnode *vp, struct filestat *fsp)
 	fsp->mode = ino.ino_data.mode | mtrans(vp->v_type);
 	fsp->fileid = (long)ino.ino_leaf.base.obj_id;
 	fsp->size = ino.ino_data.size;
-	fsp->rdev = dev2udev(vp->v_rdev);
+	fsp->rdev = fstat_dev2udev(vp->v_rdev);
 	return 1;
 }
diff --git a/usr.bin/fstat/hammer2.c b/usr.bin/fstat/hammer2.c
index fc78fd0ed0..26919777d4 100644
--- a/usr.bin/fstat/hammer2.c
+++ b/usr.bin/fstat/hammer2.c
@@ -57,7 +57,7 @@ hammer2_filestat(struct vnode *vp, struct filestat *fsp)
 		return 0;
 	}
 
-	fsp->fsid = fsp->rdev = dev2udev(vp->v_rdev);
+	fsp->fsid = fsp->rdev = fstat_dev2udev(vp->v_rdev);
 	fsp->mode = ino.meta.mode | mtrans(vp->v_type);
 	fsp->fileid = ino.meta.inum;
 	fsp->size = ino.meta.size;
diff --git a/usr.bin/fstat/msdosfs.c b/usr.bin/fstat/msdosfs.c
index 1c0d192b7e..a2bc86314c 100644
--- a/usr.bin/fstat/msdosfs.c
+++ b/usr.bin/fstat/msdosfs.c
@@ -104,7 +104,7 @@ msdosfs_filestat(struct vnode *vp, struct filestat *fsp)
 		}
 	}
 
-	fsp->fsid = fsp->rdev = dev2udev(denode.de_dev);
+	fsp->fsid = fsp->rdev = fstat_dev2udev(denode.de_dev);
 	fsp->mode = 0555;
 	fsp->mode |= denode.de_Attributes & ATTR_READONLY ? 0 : 0222;
 	fsp->mode &= mnt->data.pm_mask;
diff --git a/usr.bin/fstat/ntfs.c b/usr.bin/fstat/ntfs.c
index 53a536e5d1..b681550ed0 100644
--- a/usr.bin/fstat/ntfs.c
+++ b/usr.bin/fstat/ntfs.c
@@ -67,7 +67,7 @@ ntfs_filestat(struct vnode *vp, struct filestat *fsp)
 		return 0;
 	}
 	fsp->mode = mp.ntm_mode | mtrans(vp->v_type);
-	fsp->rdev = fsp->fsid = dev2udev(ino.i_dev);
+	fsp->rdev = fsp->fsid = fstat_dev2udev(ino.i_dev);
 	fsp->size = fn.f_size;
 	fsp->fileid = ino.i_number;