aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/xfs/linux-2.6/xfs_buf.c10
-rw-r--r--fs/xfs/linux-2.6/xfs_buf.h1
-rw-r--r--fs/xfs/xfs_mount.c9
3 files changed, 0 insertions, 20 deletions
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index 049f87116174..c60e69431e11 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -1563,16 +1563,6 @@ xfs_free_buftarg(
1563 kmem_free(btp, sizeof(*btp)); 1563 kmem_free(btp, sizeof(*btp));
1564} 1564}
1565 1565
1566void
1567xfs_incore_relse(
1568 xfs_buftarg_t *btp,
1569 int delwri_only,
1570 int wait)
1571{
1572 invalidate_bdev(btp->pbr_bdev, 1);
1573 truncate_inode_pages(btp->pbr_mapping, 0LL);
1574}
1575
1576STATIC int 1566STATIC int
1577xfs_setsize_buftarg_flags( 1567xfs_setsize_buftarg_flags(
1578 xfs_buftarg_t *btp, 1568 xfs_buftarg_t *btp,
diff --git a/fs/xfs/linux-2.6/xfs_buf.h b/fs/xfs/linux-2.6/xfs_buf.h
index 74deed8e6d90..3f8f69a66aea 100644
--- a/fs/xfs/linux-2.6/xfs_buf.h
+++ b/fs/xfs/linux-2.6/xfs_buf.h
@@ -576,7 +576,6 @@ extern xfs_buftarg_t *xfs_alloc_buftarg(struct block_device *, int);
576extern void xfs_free_buftarg(xfs_buftarg_t *, int); 576extern void xfs_free_buftarg(xfs_buftarg_t *, int);
577extern void xfs_wait_buftarg(xfs_buftarg_t *); 577extern void xfs_wait_buftarg(xfs_buftarg_t *);
578extern int xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int, unsigned int); 578extern int xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int, unsigned int);
579extern void xfs_incore_relse(xfs_buftarg_t *, int, int);
580extern int xfs_flush_buftarg(xfs_buftarg_t *, int); 579extern int xfs_flush_buftarg(xfs_buftarg_t *, int);
581 580
582#define xfs_getsize_buftarg(buftarg) \ 581#define xfs_getsize_buftarg(buftarg) \
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 5b363fcf8665..82e1646e6243 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -1112,15 +1112,6 @@ xfs_unmountfs(xfs_mount_t *mp, struct cred *cr)
1112 */ 1112 */
1113 ASSERT(mp->m_inodes == NULL); 1113 ASSERT(mp->m_inodes == NULL);
1114 1114
1115 /*
1116 * We may have bufs that are in the process of getting written still.
1117 * We must wait for the I/O completion of those. The sync flag here
1118 * does a two pass iteration thru the bufcache.
1119 */
1120 if (XFS_FORCED_SHUTDOWN(mp)) {
1121 xfs_incore_relse(mp->m_ddev_targp, 0, 1); /* synchronous */
1122 }
1123
1124 xfs_unmountfs_close(mp, cr); 1115 xfs_unmountfs_close(mp, cr);
1125 if ((mp->m_flags & XFS_MOUNT_NOUUID) == 0) 1116 if ((mp->m_flags & XFS_MOUNT_NOUUID) == 0)
1126 xfs_uuid_unmount(mp); 1117 xfs_uuid_unmount(mp);