git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
xfs
/
xfs_utils.c
diff --git
a/fs/xfs/xfs_utils.c
b/fs/xfs/xfs_utils.c
index
34654ec
..
9014d7e
100644
(file)
--- a/
fs/xfs/xfs_utils.c
+++ b/
fs/xfs/xfs_utils.c
@@
-24,12
+24,10
@@
#include "xfs_trans.h"
#include "xfs_sb.h"
#include "xfs_ag.h"
#include "xfs_trans.h"
#include "xfs_sb.h"
#include "xfs_ag.h"
-#include "xfs_dir.h"
#include "xfs_dir2.h"
#include "xfs_dmapi.h"
#include "xfs_mount.h"
#include "xfs_bmap_btree.h"
#include "xfs_dir2.h"
#include "xfs_dmapi.h"
#include "xfs_mount.h"
#include "xfs_bmap_btree.h"
-#include "xfs_dir_sf.h"
#include "xfs_dir2_sf.h"
#include "xfs_attr_sf.h"
#include "xfs_dinode.h"
#include "xfs_dir2_sf.h"
#include "xfs_attr_sf.h"
#include "xfs_dinode.h"
@@
-51,10
+49,10
@@
*/
int
xfs_get_dir_entry(
*/
int
xfs_get_dir_entry(
-
vname_t
*dentry,
+
bhv_vname_t
*dentry,
xfs_inode_t **ipp)
{
xfs_inode_t **ipp)
{
-
vnode_t
*vp;
+
bhv_vnode_t
*vp;
vp = VNAME_TO_VNODE(dentry);
vp = VNAME_TO_VNODE(dentry);
@@
-69,11
+67,11
@@
int
xfs_dir_lookup_int(
bhv_desc_t *dir_bdp,
uint lock_mode,
xfs_dir_lookup_int(
bhv_desc_t *dir_bdp,
uint lock_mode,
-
vname_t
*dentry,
+
bhv_vname_t
*dentry,
xfs_ino_t *inum,
xfs_inode_t **ipp)
{
xfs_ino_t *inum,
xfs_inode_t **ipp)
{
-
vnode_t
*dir_vp;
+
bhv_vnode_t
*dir_vp;
xfs_inode_t *dp;
int error;
xfs_inode_t *dp;
int error;
@@
-82,8
+80,7
@@
xfs_dir_lookup_int(
dp = XFS_BHVTOI(dir_bdp);
dp = XFS_BHVTOI(dir_bdp);
- error = XFS_DIR_LOOKUP(dp->i_mount, NULL, dp,
- VNAME(dentry), VNAMELEN(dentry), inum);
+ error = xfs_dir_lookup(NULL, dp, VNAME(dentry), VNAMELEN(dentry), inum);
if (!error) {
/*
* Unlock the directory. We do this because we can't
if (!error) {
/*
* Unlock the directory. We do this because we can't