aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/xfs/xfs_bmap_util.c2
-rw-r--r--fs/xfs/xfs_vnode.h6
2 files changed, 1 insertions, 7 deletions
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 1b79b8c19c37..bf7e6159cfe2 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -1766,7 +1766,7 @@ xfs_swap_extents(
1766 * vop_read (or write in the case of autogrow) they block on the iolock 1766 * vop_read (or write in the case of autogrow) they block on the iolock
1767 * until we have switched the extents. 1767 * until we have switched the extents.
1768 */ 1768 */
1769 if (VN_MAPPED(VFS_I(ip))) { 1769 if (mapping_mapped(VFS_I(ip)->i_mapping)) {
1770 error = -EBUSY; 1770 error = -EBUSY;
1771 goto out_unlock; 1771 goto out_unlock;
1772 } 1772 }
diff --git a/fs/xfs/xfs_vnode.h b/fs/xfs/xfs_vnode.h
index bcf0c74f0d2f..300725dc3626 100644
--- a/fs/xfs/xfs_vnode.h
+++ b/fs/xfs/xfs_vnode.h
@@ -34,10 +34,4 @@ struct attrlist_cursor_kern;
34 { IO_ISDIRECT, "DIRECT" }, \ 34 { IO_ISDIRECT, "DIRECT" }, \
35 { IO_INVIS, "INVIS"} 35 { IO_INVIS, "INVIS"}
36 36
37/*
38 * Some useful predicates.
39 */
40#define VN_MAPPED(vp) mapping_mapped(vp->i_mapping)
41
42
43#endif /* __XFS_VNODE_H__ */ 37#endif /* __XFS_VNODE_H__ */