lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[XFS] remove some easy bhv_vnode_t instances

Browse Source 
In various places we can just move a VFS_I call into the argument list of
called functions/macros instead of having a local bhv_vnode_t.

SGI-PV: 981498

SGI-Modid: xfs-linux-melb:xfs-kern:31776a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:
Christoph Hellwig
2008-08-13 16:22:09 +10:00
committed by Lachlan McIlroy
parent e1cccd917b
commit df80c933f9
6 changed files with 17 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/xfs/xfs_dfrag.c
View File

@@ -130,7 +130,6 @@ xfs_swap_extents(
xfs_mount_t *mp;
xfs_trans_t *tp;
xfs_bstat_t *sbp = &sxp->sx_stat;
bhv_vnode_t *vp, *tvp;
xfs_ifork_t *tempifp, *ifp, *tifp;
int ilf_fields, tilf_fields;
static uint lock_flags = XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL;
@@ -149,8 +148,6 @@ xfs_swap_extents(
}
sbp = &sxp->sx_stat;
vp = VFS_I(ip);
tvp = VFS_I(tip);
xfs_lock_two_inodes(ip, tip, lock_flags);
locked = 1;
@@ -174,7 +171,7 @@ xfs_swap_extents(
goto error0;
}
if (VN_CACHED(tvp) != 0) {
if (VN_CACHED(VFS_I(tip)) != 0) {
xfs_inval_cached_trace(tip, 0, -1, 0, -1);
error = xfs_flushinval_pages(tip, 0, -1,
FI_REMAPF_LOCKED);
@@ -183,7 +180,7 @@ xfs_swap_extents(
}
/* Verify O_DIRECT for ftmp */
if (VN_CACHED(tvp) != 0) {
if (VN_CACHED(VFS_I(tip)) != 0) {
error = XFS_ERROR(EINVAL);
goto error0;
}
@@ -227,7 +224,7 @@ xfs_swap_extents(
* vop_read (or write in the case of autogrow) they block on the iolock
* until we have switched the extents.
*/
if (VN_MAPPED(vp)) {
if (VN_MAPPED(VFS_I(ip))) {
error = XFS_ERROR(EBUSY);
goto error0;
}