diff options
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_export.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_export.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/xfs/linux-2.6/xfs_export.c b/fs/xfs/linux-2.6/xfs_export.c index 391c1353cd42..b768ea910bbe 100644 --- a/fs/xfs/linux-2.6/xfs_export.c +++ b/fs/xfs/linux-2.6/xfs_export.c | |||
@@ -97,7 +97,7 @@ xfs_fs_encode_fh( | |||
97 | int len; | 97 | int len; |
98 | int is64 = 0; | 98 | int is64 = 0; |
99 | #if XFS_BIG_INUMS | 99 | #if XFS_BIG_INUMS |
100 | vfs_t *vfs = LINVFS_GET_VFS(inode->i_sb); | 100 | vfs_t *vfs = vfs_from_sb(inode->i_sb); |
101 | 101 | ||
102 | if (!(vfs->vfs_flag & VFS_32BITINODES)) { | 102 | if (!(vfs->vfs_flag & VFS_32BITINODES)) { |
103 | /* filesystem may contain 64bit inode numbers */ | 103 | /* filesystem may contain 64bit inode numbers */ |
@@ -139,14 +139,14 @@ xfs_fs_get_dentry( | |||
139 | vnode_t *vp; | 139 | vnode_t *vp; |
140 | struct inode *inode; | 140 | struct inode *inode; |
141 | struct dentry *result; | 141 | struct dentry *result; |
142 | vfs_t *vfsp = LINVFS_GET_VFS(sb); | 142 | vfs_t *vfsp = vfs_from_sb(sb); |
143 | int error; | 143 | int error; |
144 | 144 | ||
145 | VFS_VGET(vfsp, &vp, (fid_t *)data, error); | 145 | VFS_VGET(vfsp, &vp, (fid_t *)data, error); |
146 | if (error || vp == NULL) | 146 | if (error || vp == NULL) |
147 | return ERR_PTR(-ESTALE) ; | 147 | return ERR_PTR(-ESTALE) ; |
148 | 148 | ||
149 | inode = LINVFS_GET_IP(vp); | 149 | inode = vn_to_inode(vp); |
150 | result = d_alloc_anon(inode); | 150 | result = d_alloc_anon(inode); |
151 | if (!result) { | 151 | if (!result) { |
152 | iput(inode); | 152 | iput(inode); |
@@ -164,12 +164,12 @@ xfs_fs_get_parent( | |||
164 | struct dentry *parent; | 164 | struct dentry *parent; |
165 | 165 | ||
166 | cvp = NULL; | 166 | cvp = NULL; |
167 | vp = LINVFS_GET_VP(child->d_inode); | 167 | vp = vn_from_inode(child->d_inode); |
168 | VOP_LOOKUP(vp, &dotdot, &cvp, 0, NULL, NULL, error); | 168 | VOP_LOOKUP(vp, &dotdot, &cvp, 0, NULL, NULL, error); |
169 | if (unlikely(error)) | 169 | if (unlikely(error)) |
170 | return ERR_PTR(-error); | 170 | return ERR_PTR(-error); |
171 | 171 | ||
172 | parent = d_alloc_anon(LINVFS_GET_IP(cvp)); | 172 | parent = d_alloc_anon(vn_to_inode(cvp)); |
173 | if (unlikely(!parent)) { | 173 | if (unlikely(!parent)) { |
174 | VN_RELE(cvp); | 174 | VN_RELE(cvp); |
175 | return ERR_PTR(-ENOMEM); | 175 | return ERR_PTR(-ENOMEM); |