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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
fs
/
xfs
/
linux-2.6
/
xfs_export.c
diff --git
a/fs/xfs/linux-2.6/xfs_export.c
b/fs/xfs/linux-2.6/xfs_export.c
index
5fb75d9
..
b768ea9
100644
(file)
--- a/
fs/xfs/linux-2.6/xfs_export.c
+++ b/
fs/xfs/linux-2.6/xfs_export.c
@@
-21,6
+21,7
@@
#include "xfs_log.h"
#include "xfs_trans.h"
#include "xfs_sb.h"
#include "xfs_log.h"
#include "xfs_trans.h"
#include "xfs_sb.h"
+#include "xfs_dir.h"
#include "xfs_mount.h"
#include "xfs_export.h"
#include "xfs_mount.h"
#include "xfs_export.h"
@@
-96,7
+97,7
@@
xfs_fs_encode_fh(
int len;
int is64 = 0;
#if XFS_BIG_INUMS
int len;
int is64 = 0;
#if XFS_BIG_INUMS
-
bhv_vfs_t
*vfs = vfs_from_sb(inode->i_sb);
+
vfs_t
*vfs = vfs_from_sb(inode->i_sb);
if (!(vfs->vfs_flag & VFS_32BITINODES)) {
/* filesystem may contain 64bit inode numbers */
if (!(vfs->vfs_flag & VFS_32BITINODES)) {
/* filesystem may contain 64bit inode numbers */
@@
-135,13
+136,13
@@
xfs_fs_get_dentry(
struct super_block *sb,
void *data)
{
struct super_block *sb,
void *data)
{
-
bhv_vnode_t
*vp;
+
vnode_t
*vp;
struct inode *inode;
struct dentry *result;
struct inode *inode;
struct dentry *result;
-
bhv_vfs_t
*vfsp = vfs_from_sb(sb);
+
vfs_t
*vfsp = vfs_from_sb(sb);
int error;
int error;
-
error = bhv_vfs_vget(vfsp, &vp, (fid_t *)data
);
+
VFS_VGET(vfsp, &vp, (fid_t *)data, error
);
if (error || vp == NULL)
return ERR_PTR(-ESTALE) ;
if (error || vp == NULL)
return ERR_PTR(-ESTALE) ;
@@
-159,12
+160,12
@@
xfs_fs_get_parent(
struct dentry *child)
{
int error;
struct dentry *child)
{
int error;
-
bhv_vnode_t
*vp, *cvp;
+
vnode_t
*vp, *cvp;
struct dentry *parent;
cvp = NULL;
vp = vn_from_inode(child->d_inode);
struct dentry *parent;
cvp = NULL;
vp = vn_from_inode(child->d_inode);
-
error = bhv_vop_lookup(vp, &dotdot, &cvp, 0, NULL, NULL
);
+
VOP_LOOKUP(vp, &dotdot, &cvp, 0, NULL, NULL, error
);
if (unlikely(error))
return ERR_PTR(-error);
if (unlikely(error))
return ERR_PTR(-error);