Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

[linux-2.6-omap-h63xx.git] / fs / xfs / linux-2.6 / xfs_fs_subr.c

diff --git a/fs/xfs/linux-2.6/xfs_fs_subr.c b/fs/xfs/linux-2.6/xfs_fs_subr.c
index f89340c61bf289ddc1dd81ce9580e3b97a36ef41..575f2a790f315e9ff84530ea39d4659c1135756e 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_fs_subr.c
+++ b/fs/xfs/linux-2.6/xfs_fs_subr.c
@@ -57,7 +57,7 @@ fs_tosspages(
        int             fiopt)
 {
        vnode_t         *vp = BHV_TO_VNODE(bdp);
-       struct inode    *ip = LINVFS_GET_IP(vp);
+       struct inode    *ip = vn_to_inode(vp);
 
        if (VN_CACHED(vp))
                truncate_inode_pages(ip->i_mapping, first);
@@ -76,11 +76,10 @@ fs_flushinval_pages(
        int             fiopt)
 {
        vnode_t         *vp = BHV_TO_VNODE(bdp);
-       struct inode    *ip = LINVFS_GET_IP(vp);
+       struct inode    *ip = vn_to_inode(vp);
 
        if (VN_CACHED(vp)) {
-               filemap_fdatawrite(ip->i_mapping);
-               filemap_fdatawait(ip->i_mapping);
+               filemap_write_and_wait(ip->i_mapping);
 
                truncate_inode_pages(ip->i_mapping, first);
        }
@@ -99,7 +98,7 @@ fs_flush_pages(
        int             fiopt)
 {
        vnode_t         *vp = BHV_TO_VNODE(bdp);
-       struct inode    *ip = LINVFS_GET_IP(vp);
+       struct inode    *ip = vn_to_inode(vp);
 
        if (VN_CACHED(vp)) {
                filemap_fdatawrite(ip->i_mapping);