|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Minios-devel] [UNIKRAFT PATCH v2 12/23] lib/vfscore: prefix exported functions
Signed-off-by: Yuri Volchkov <yuri.volchkov@xxxxxxxxx>
---
lib/vfscore/include/vfscore/mount.h | 4 ++--
lib/vfscore/include/vfscore/prex.h | 6 +++---
lib/vfscore/include/vfscore/uio.h | 2 +-
lib/vfscore/include/vfscore/vnode.h | 10 +++++-----
lib/vfscore/mount.c | 9 ++++-----
lib/vfscore/subr_uio.c | 2 +-
lib/vfscore/vfs.h | 2 +-
lib/vfscore/vnode.c | 12 ++++++------
8 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/lib/vfscore/include/vfscore/mount.h
b/lib/vfscore/include/vfscore/mount.h
index b4a07323..a1227cbe 100644
--- a/lib/vfscore/include/vfscore/mount.h
+++ b/lib/vfscore/include/vfscore/mount.h
@@ -139,12 +139,12 @@ typedef int (*vfsop_statfs_t)(struct mount *, struct
statfs *);
#define VFS_NULL ((void *)vfs_null)
-int vfs_nullop(void);
+int vfscore_nullop(void);
int vfs_einval(void);
void vfs_busy(struct mount *mp);
void vfs_unbusy(struct mount *mp);
-void release_mp_dentries(struct mount *mp);
+void vfscore_release_mp_dentries(struct mount *mp);
#endif /* !_SYS_MOUNT_H_ */
diff --git a/lib/vfscore/include/vfscore/prex.h
b/lib/vfscore/include/vfscore/prex.h
index 8a306d54..2261b216 100644
--- a/lib/vfscore/include/vfscore/prex.h
+++ b/lib/vfscore/include/vfscore/prex.h
@@ -33,8 +33,8 @@
* THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
*/
-#ifndef _OSV_PREX_H
-#define _OSV_PREX_H 1
+#ifndef _UK_PREX_H
+#define _UK_PREX_H 1
#include <unistd.h>
@@ -52,4 +52,4 @@ size_t strlcpy(char *dst, const char *src, size_t siz);
void sys_panic(const char *);
-#endif /* _OSV_PREX_H */
+#endif /* _UK_PREX_H */
diff --git a/lib/vfscore/include/vfscore/uio.h
b/lib/vfscore/include/vfscore/uio.h
index 8ad1e3fb..c734fa19 100644
--- a/lib/vfscore/include/vfscore/uio.h
+++ b/lib/vfscore/include/vfscore/uio.h
@@ -57,6 +57,6 @@ struct uio {
enum uio_rw uio_rw; /* operation */
};
-int uiomove(void *cp, int n, struct uio *uio);
+int vfscore_uiomove(void *cp, int n, struct uio *uio);
#endif /* !_UIO_H_ */
diff --git a/lib/vfscore/include/vfscore/vnode.h
b/lib/vfscore/include/vfscore/vnode.h
index 4155a7db..08b8e562 100644
--- a/lib/vfscore/include/vfscore/vnode.h
+++ b/lib/vfscore/include/vfscore/vnode.h
@@ -229,10 +229,10 @@ struct vnops {
#define VOP_READLINK(VP, U) ((VP)->v_op->vop_readlink)(VP, U)
#define VOP_SYMLINK(DVP, OP, NP) ((DVP)->v_op->vop_symlink)(DVP, OP, NP)
-int vop_nullop(void);
-int vop_einval(void);
-int vop_eperm(void);
-int vop_erofs(void);
+int vfscore_vop_nullop(void);
+int vfscore_vop_einval(void);
+int vfscore_vop_eperm(void);
+int vfscore_vop_erofs(void);
struct vnode *vn_lookup(struct mount *, uint64_t);
void vn_lock(struct vnode *);
void vn_unlock(struct vnode *);
@@ -240,7 +240,7 @@ int vn_stat(struct vnode *, struct stat *);
int vn_settimes(struct vnode *, struct timespec[2]);
int vn_setmode(struct vnode *, mode_t mode);
int vn_access(struct vnode *, int);
-int vget(struct mount *, uint64_t ino, struct vnode **vpp);
+int vfscore_vget(struct mount *, uint64_t ino, struct vnode **vpp);
void vput(struct vnode *);
void vref(struct vnode *);
void vrele(struct vnode *);
diff --git a/lib/vfscore/mount.c b/lib/vfscore/mount.c
index daed87fa..694175f1 100644
--- a/lib/vfscore/mount.c
+++ b/lib/vfscore/mount.c
@@ -242,7 +242,7 @@ sys_mount(const char *dev, const char *dir, const char
*fsname, int flags, const
}
void
-release_mp_dentries(struct mount *mp)
+vfscore_release_mp_dentries(struct mount *mp)
{
/* Decrement referece count of root vnode */
if (mp->m_covered) {
@@ -466,8 +466,7 @@ vfs_unbusy(struct mount *mp)
ukarch_dec(&mp->m_count);
}
-int
-vfs_nullop(void)
+int vfscore_nullop(void)
{
return 0;
}
@@ -480,12 +479,12 @@ vfs_einval(void)
#ifdef DEBUG_VFS
void
-mount_dump(void)
+vfscore_mount_dump(void)
{
struct mount *mp;
uk_mutex_lock(&mount_lock);
- uk_pr_debug("mount_dump\n");
+ uk_pr_debug("vfscore_mount_dump\n");
uk_pr_debug("dev count root\n");
uk_pr_debug("-------- ----- --------\n");
diff --git a/lib/vfscore/subr_uio.c b/lib/vfscore/subr_uio.c
index d8e9d1be..aa176074 100644
--- a/lib/vfscore/subr_uio.c
+++ b/lib/vfscore/subr_uio.c
@@ -46,7 +46,7 @@
#include <vfscore/uio.h>
int
-uiomove(void *cp, int n, struct uio *uio)
+vfscore_uiomove(void *cp, int n, struct uio *uio)
{
UK_ASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE);
diff --git a/lib/vfscore/vfs.h b/lib/vfscore/vfs.h
index 609dc1f5..94fe89a5 100644
--- a/lib/vfscore/vfs.h
+++ b/lib/vfscore/vfs.h
@@ -148,7 +148,7 @@ void dentry_init(void);
#ifdef DEBUG_VFS
void vnode_dump(void);
-void mount_dump(void);
+void vfscore_mount_dump(void);
#endif
static void __attribute__((unused)) uk_vfscore_trace(int foo __unused, ...)
diff --git a/lib/vfscore/vnode.c b/lib/vfscore/vnode.c
index 86e6d9c7..e9e040aa 100644
--- a/lib/vfscore/vnode.c
+++ b/lib/vfscore/vnode.c
@@ -66,7 +66,7 @@ int vttoif_tab[10] = {
* ---------- --------- ----------
* vn_lock * Lock
* vn_unlock * Unlock
- * vget 1 Lock
+ * vfscore_vget 1 Lock
* vput -1 Unlock
* vref +1 *
* vrele -1 *
@@ -172,7 +172,7 @@ vn_unlock(struct vnode *vp)
* Returns 1 if vnode was found in cache; otherwise returns 0.
*/
int
-vget(struct mount *mp, uint64_t ino, struct vnode **vpp)
+vfscore_vget(struct mount *mp, uint64_t ino, struct vnode **vpp)
{
struct vnode *vp;
int error;
@@ -476,25 +476,25 @@ vnode_dump(void)
#endif
int
-vop_nullop(void)
+vfscore_vop_nullop(void)
{
return 0;
}
int
-vop_einval(void)
+vfscore_vop_einval(void)
{
return EINVAL;
}
int
-vop_eperm(void)
+vfscore_vop_eperm(void)
{
return EPERM;
}
int
-vop_erofs(void)
+vfscore_vop_erofs(void)
{
return EROFS;
}
--
2.19.2
_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |