Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No need to load a vnode/fnode pair to lookup attributes on a ntnode.

Browse Source 
Use ntfs_ntlookup()/ntfs_ntput() instead.
This commit is contained in:
hannken 2015-01-06 11:04:00 +00:00
parent e8b589e23d
commit 9e220db89c
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/fs/ntfs/ntfs_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_subr.c,v 1.57 2015/01/04 16:19:12 christos Exp $ */
/* $NetBSD: ntfs_subr.c,v 1.58 2015/01/06 11:04:00 hannken Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko (semenu@FreeBSD.org)
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.57 2015/01/04 16:19:12 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.58 2015/01/06 11:04:00 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -150,7 +150,6 @@ ntfs_findvattr(struct ntfsmount *ntmp, struct ntnode *ip, struct ntvattr **lvapp
/*
* Search attribute specified in ntnode (load ntnode if necessary).
* If not found but ATTR_A_ATTRLIST present, read it in and search through.
* VOP_VGET node needed, and lookup through its ntnode (load if necessary).
*
* ntnode should be locked
*/
@ -161,7 +160,6 @@ ntfs_ntvattrget(struct ntfsmount *ntmp, struct ntnode *ip, u_int32_t type,
struct ntvattr *lvap = NULL;
struct attr_attrlist *aalp;
struct attr_attrlist *nextaalp;
struct vnode *newvp;
struct ntnode *newip;
void *alpool;
size_t namelen, len;
@ -224,18 +222,17 @@ ntfs_ntvattrget(struct ntfsmount *ntmp, struct ntnode *ip, u_int32_t type,
dprintf(("%s: attribute in ino: %d\n", __func__,
aalp->al_inumber));
error = ntfs_vgetex(ntmp->ntm_mountp, aalp->al_inumber,
NTFS_A_DATA, "", LK_EXCLUSIVE, &newvp);
error = ntfs_ntlookup(ntmp, aalp->al_inumber, &newip);
if (error) {
printf("%s: CAN'T VGET INO: %d (error %d)\n", __func__,
aalp->al_inumber, error);
printf("%s: can't lookup ino %d"
" for %" PRId64 " attr %x: error %d\n", __func__,
aalp->al_inumber, ip->i_number, type, error);
goto out;
}
newip = VTONT(newvp);
/* XXX have to lock ntnode */
error = ntfs_findvattr(ntmp, newip, &lvap, vapp,
type, name, namelen, vcn);
vput(newvp);
ntfs_ntput(newip);
if (error == 0)
goto out;
printf("%s: ATTRLIST ERROR.\n", __func__);