Mercurial > unleashed > wips

changeset 20525:26892e448011

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
treewide: mmap64() -> mmap()
author Lauri Tirkkonen <lotheac@iki.fi>
date Tue, 16 Apr 2019 22:49:12 +0300
parents 318619db5bd1
children c674f0db1414
files usr/src/cmd/backup/dump/dumptraverse.c usr/src/lib/libc/port/rt/mqueue.c usr/src/lib/libc/port/rt/sem.c usr/src/lib/libctf/common/ctf_lib.c usr/src/lib/libkvm/common/kvm.c usr/src/lib/madv/common/madv.c usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_hca.c usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_ibtf_qp.c usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_ibtf_util.c
diffstat 9 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/backup/dump/dumptraverse.c	Tue Apr 16 22:49:12 2019 +0300
+++ b/usr/src/cmd/backup/dump/dumptraverse.c	Tue Apr 16 22:49:12 2019 +0300
@@ -825,7 +825,7 @@
 		mapoff = filoff - displacement;
 		/* LINTED offset will fit into 32 bits */
 		len = (size_t)roundup(cnt + (filoff - mapoff), pagesize);
-		maddr = mmap64(NULL, len, PROT_READ, MAP_SHARED, mapfd, mapoff);
+		maddr = mmap(NULL, len, PROT_READ, MAP_SHARED, mapfd, mapoff);
 		if (maddr != MAP_FAILED) {
 			(void) memcpy(ba, maddr + displacement, cnt);
 			(void) munmap(maddr, len);
--- a/usr/src/lib/libc/port/rt/mqueue.c	Tue Apr 16 22:49:12 2019 +0300
+++ b/usr/src/lib/libc/port/rt/mqueue.c	Tue Apr 16 22:49:12 2019 +0300
@@ -485,7 +485,7 @@
 	}
 	cr_flag |= ALLOC_MEM;
 
-	if ((ptr = mmap64(NULL, total_size, PROT_READ|PROT_WRITE,
+	if ((ptr = mmap(NULL, total_size, PROT_READ|PROT_WRITE,
 	    MAP_SHARED, fd, (off64_t)0)) == MAP_FAILED)
 		goto out;
 	mqhp = ptr;
@@ -507,7 +507,7 @@
 	if (ftruncate(fd, (off64_t)sizeof (struct mq_dn)) < 0)
 		goto out;
 
-	if ((ptr = mmap64(NULL, sizeof (struct mq_dn),
+	if ((ptr = mmap(NULL, sizeof (struct mq_dn),
 	    PROT_READ | PROT_WRITE, MAP_SHARED, fd, (off64_t)0)) == MAP_FAILED)
 		goto out;
 	mqdnp = ptr;
--- a/usr/src/lib/libc/port/rt/sem.c	Tue Apr 16 22:49:12 2019 +0300
+++ b/usr/src/lib/libc/port/rt/sem.c	Tue Apr 16 22:49:12 2019 +0300
@@ -137,7 +137,7 @@
 	cr_flag |= ALLOC_MEM;
 
 	/* LINTED */
-	sem = mmap64(NULL, sizeof (sem_t), PROT_READ|PROT_WRITE,
+	sem = mmap(NULL, sizeof (sem_t), PROT_READ|PROT_WRITE,
 	    MAP_SHARED, fd, (off64_t)0);
 	(void) __close_nc(fd);
 	cr_flag &= ~DFILE_OPEN;
--- a/usr/src/lib/libctf/common/ctf_lib.c	Tue Apr 16 22:49:12 2019 +0300
+++ b/usr/src/lib/libctf/common/ctf_lib.c	Tue Apr 16 22:49:12 2019 +0300
@@ -389,7 +389,7 @@
 {
 	size_t pageoff = sp->cts_offset & ~_PAGEMASK;
 
-	caddr_t base = mmap64(NULL, sp->cts_size + pageoff, PROT_READ,
+	caddr_t base = mmap(NULL, sp->cts_size + pageoff, PROT_READ,
 	    MAP_PRIVATE, fd, sp->cts_offset & _PAGEMASK);
 
 	if (base != MAP_FAILED)
@@ -455,7 +455,7 @@
 		if (hdr.ctf.ctp_version > CTF_VERSION)
 			return (ctf_set_open_errno(errp, ECTF_CTFVERS));
 
-		ctfsect.cts_data = mmap64(NULL, st.st_size, PROT_READ,
+		ctfsect.cts_data = mmap(NULL, st.st_size, PROT_READ,
 		    MAP_PRIVATE, fd, 0);
 
 		if (ctfsect.cts_data == MAP_FAILED)
@@ -574,7 +574,7 @@
 		strs_mapsz = sp[shstrndx].sh_size +
 		    (sp[shstrndx].sh_offset & ~_PAGEMASK);
 
-		strs_map = mmap64(NULL, strs_mapsz, PROT_READ, MAP_PRIVATE,
+		strs_map = mmap(NULL, strs_mapsz, PROT_READ, MAP_PRIVATE,
 		    fd, sp[shstrndx].sh_offset & _PAGEMASK);
 
 		strs = (const char *)strs_map +
--- a/usr/src/lib/libkvm/common/kvm.c	Tue Apr 16 22:49:12 2019 +0300
+++ b/usr/src/lib/libkvm/common/kvm.c	Tue Apr 16 22:49:12 2019 +0300
@@ -153,10 +153,10 @@
 		 */
 		kd->kvm_coremapsize = (size_t)corestat.st_size;
 		if (corestat.st_size > LONG_MAX ||
-		    (kd->kvm_core = mmap64(NULL, kd->kvm_coremapsize,
+		    (kd->kvm_core = mmap(NULL, kd->kvm_coremapsize,
 		    PROT_READ, MAP_SHARED, kd->kvm_corefd, 0)) == MAP_FAILED) {
 			kd->kvm_coremapsize = kd->kvm_dump.dump_data;
-			if ((kd->kvm_core = mmap64(NULL, kd->kvm_coremapsize,
+			if ((kd->kvm_core = mmap(NULL, kd->kvm_coremapsize,
 			    PROT_READ, MAP_SHARED, kd->kvm_corefd, 0)) ==
 			    MAP_FAILED)
 				return (fail(kd, err, "cannot mmap corefile"));
--- a/usr/src/lib/madv/common/madv.c	Tue Apr 16 22:49:12 2019 +0300
+++ b/usr/src/lib/madv/common/madv.c	Tue Apr 16 22:49:12 2019 +0300
@@ -776,7 +776,7 @@
  * mmap64 interpose
  */
 void *
-mmap64(void *addr, size_t len, int prot, int flags, int fd, off64_t pos)
+mmap(void *addr, size_t len, int prot, int flags, int fd, off64_t pos)
 {
 	static void *(*mmap64func)();
 	void *result;
--- a/usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_hca.c	Tue Apr 16 22:49:12 2019 +0300
+++ b/usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_hca.c	Tue Apr 16 22:49:12 2019 +0300
@@ -266,7 +266,7 @@
 	uarpg_offset = (((off64_t)cur_pid << MLNX_UMAP_RSRC_TYPE_SHIFT) |
 	    MLNX_UMAP_UARPG_RSRC) * pagesize;
 
-	mapaddr = mmap64(NULL, pagesize, PROT_READ | PROT_WRITE,
+	mapaddr = mmap(NULL, pagesize, PROT_READ | PROT_WRITE,
 	    MAP_SHARED, fd, uarpg_offset);
 	if (mapaddr == MAP_FAILED) {
 		dapl_dbg_log(DAPL_DBG_TYPE_ERR,
@@ -287,7 +287,7 @@
 	uarpg_offset = (((off64_t)cur_pid << MLNX_UMAP_RSRC_TYPE_SHIFT) |
 	    MLNX_UMAP_BLUEFLAMEPG_RSRC) * pagesize;
 
-	mapaddr = mmap64(NULL, pagesize, PROT_READ | PROT_WRITE,
+	mapaddr = mmap(NULL, pagesize, PROT_READ | PROT_WRITE,
 	    MAP_SHARED, fd, uarpg_offset);
 	if (mapaddr == MAP_FAILED) {
 		/* This is not considered to be fatal.  Charge on! */
--- a/usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_ibtf_qp.c	Tue Apr 16 22:49:12 2019 +0300
+++ b/usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_ibtf_qp.c	Tue Apr 16 22:49:12 2019 +0300
@@ -294,7 +294,7 @@
 		qp_p->qp_rq_dbp = dapls_ib_get_dbp(mqp->mqp_rdbr_maplen,
 		    hca_fd, mqp->mqp_rdbr_mapoffset, mqp->mqp_rdbr_offset);
 
-	qp_p->qp_addr = mmap64(NULL, mqp->mqp_maplen,
+	qp_p->qp_addr = mmap(NULL, mqp->mqp_maplen,
 	    (PROT_READ | PROT_WRITE), MAP_SHARED, hca_fd,
 	    mqp->mqp_mapoffset);
 
@@ -642,7 +642,7 @@
 		    msrq->msrq_rdbr_maplen, hca_fd,
 		    msrq->msrq_rdbr_mapoffset, msrq->msrq_rdbr_offset);
 
-	ibsrq_p->srq_addr = mmap64(NULL,
+	ibsrq_p->srq_addr = mmap(NULL,
 	    msrq->msrq_maplen, (PROT_READ | PROT_WRITE),
 	    MAP_SHARED, hca_fd, msrq->msrq_mapoffset);
 
@@ -1001,7 +1001,7 @@
 		    hca_fd, msrq->msrq_rdbr_mapoffset,
 		    msrq->msrq_rdbr_offset);
 
-	srq_handle->srq_addr = mmap64(NULL,
+	srq_handle->srq_addr = mmap(NULL,
 	    msrq->msrq_maplen, (PROT_READ | PROT_WRITE),
 	    MAP_SHARED, hca_fd, msrq->msrq_mapoffset);
 
--- a/usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_ibtf_util.c	Tue Apr 16 22:49:12 2019 +0300
+++ b/usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_ibtf_util.c	Tue Apr 16 22:49:12 2019 +0300
@@ -168,7 +168,7 @@
 			    mcq->mcq_armdbr_mapoffset,
 			    mcq->mcq_armdbr_offset);
 
-		cq_handle->cq_addr = mmap64(
+		cq_handle->cq_addr = mmap(
 		    NULL, mcq->mcq_maplen,
 		    (PROT_READ | PROT_WRITE), MAP_SHARED, hca_fd,
 		    mcq->mcq_mapoffset);
@@ -360,7 +360,7 @@
 		    mcq->mcq_armdbr_mapoffset,
 		    mcq->mcq_armdbr_offset);
 
-	cq_addr = mmap64(NULL,
+	cq_addr = mmap(NULL,
 	    mcq->mcq_maplen, (PROT_READ | PROT_WRITE),
 	    MAP_SHARED, hca_fd, mcq->mcq_mapoffset);
 
@@ -2006,7 +2006,7 @@
 		dapl_os_unlock(&dapls_ib_dbp_lock);
 		return (MAP_FAILED);
 	}
-	new_page->dbp_page_addr = mmap64(NULL,
+	new_page->dbp_page_addr = mmap(NULL,
 	    maplen, (PROT_READ | PROT_WRITE), MAP_SHARED, fd, mapoffset);
 	if (new_page->dbp_page_addr == MAP_FAILED) {
 		free(new_page);