git: 3abc8ac68a98 - stable/13 - msdosfs: unstaticise msdosfs_lookup_
Konstantin Belousov
kib at FreeBSD.org
Fri Sep 3 01:09:00 UTC 2021
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=3abc8ac68a98bc370d07b60b83f6b5f53ba029a4
commit 3abc8ac68a98bc370d07b60b83f6b5f53ba029a4
Author: Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-08-01 17:11:40 +0000
Commit: Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-09-03 01:08:35 +0000
msdosfs: unstaticise msdosfs_lookup_
(cherry picked from commit 92d4e088274c7ada268645588503f22f390c5fb8)
---
sys/fs/msdosfs/denode.h | 2 ++
sys/fs/msdosfs/msdosfs_lookup.c | 11 ++++-------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h
index b198a6a39d81..e179bcfa7dd5 100644
--- a/sys/fs/msdosfs/denode.h
+++ b/sys/fs/msdosfs/denode.h
@@ -266,6 +266,8 @@ extern struct vop_vector msdosfs_vnodeops;
int msdosfs_lookup(struct vop_cachedlookup_args *);
int msdosfs_inactive(struct vop_inactive_args *);
int msdosfs_reclaim(struct vop_reclaim_args *);
+int msdosfs_lookup_ino(struct vnode *vdp, struct vnode **vpp,
+ struct componentname *cnp, uint64_t *inum);
#endif
/*
diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c
index a32b0372243c..bdfff7bf3206 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -63,14 +63,11 @@
#include <fs/msdosfs/fat.h>
#include <fs/msdosfs/msdosfsmount.h>
-static int msdosfs_lookup_(struct vnode *vdp, struct vnode **vpp,
- struct componentname *cnp, uint64_t *inum);
-
int
msdosfs_lookup(struct vop_cachedlookup_args *ap)
{
- return (msdosfs_lookup_(ap->a_dvp, ap->a_vpp, ap->a_cnp, NULL));
+ return (msdosfs_lookup_ino(ap->a_dvp, ap->a_vpp, ap->a_cnp, NULL));
}
struct deget_dotdot {
@@ -110,8 +107,8 @@ msdosfs_deget_dotdot(struct mount *mp, void *arg, int lkflags,
* out to disk. This way disk blocks containing directory entries and in
* memory denode's will be in synch.
*/
-static int
-msdosfs_lookup_(struct vnode *vdp, struct vnode **vpp,
+int
+msdosfs_lookup_ino(struct vnode *vdp, struct vnode **vpp,
struct componentname *cnp, uint64_t *dd_inum)
{
struct mbnambuf nb;
@@ -558,7 +555,7 @@ foundroot:
* Recheck that ".." still points to the inode we
* looked up before pdp lock was dropped.
*/
- error = msdosfs_lookup_(pdp, NULL, cnp, &inode1);
+ error = msdosfs_lookup_ino(pdp, NULL, cnp, &inode1);
if (error) {
vput(*vpp);
*vpp = NULL;
More information about the dev-commits-src-all
mailing list