d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

msdosfs: unstaticise msdosfs_lookup_

Browse Source 
and rename it to msdosfs_lookup_ino(), similarly to UFS

Reviewed by:	mckusick
Tested by:	pho
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D31464
This commit is contained in:
Konstantin Belousov 2021-08-01 20:11:40 +03:00
parent 6e1df1d14c
commit 92d4e08827
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/fs/msdosfs/denode.h
View File

@ -267,6 +267,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
/*

11
sys/fs/msdosfs/msdosfs_lookup.c
View File

@ -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;