[XFS] call common xfs vnode-level helpers directly and remove vnode operations

SGI-PV: 969608
SGI-Modid: xfs-linux-melb:xfs-kern:29493a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index b4db8a208076..a9cebcb0b33b 100644
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -54,6 +54,8 @@
 #include "xfs_mru_cache.h"
 #include "xfs_filestream.h"
 #include "xfs_fsops.h"
+#include "xfs_vnodeops.h"
+
 
 STATIC int      xfs_sync(bhv_desc_t *, int, cred_t *);
 
@@ -1191,12 +1193,13 @@ xfs_sync_inodes(
                         if (flags & SYNC_CLOSE) {
                                 /* Shutdown case. Flush and invalidate. */
                                 if (XFS_FORCED_SHUTDOWN(mp))
-                                        bhv_vop_toss_pages(vp, 0, -1, FI_REMAPF);
+                                        xfs_tosspages(ip, 0, -1,
+                                                             FI_REMAPF);
                                 else
-                                        error = bhv_vop_flushinval_pages(vp, 0,
-                                                                -1, FI_REMAPF);
+                                        error = xfs_flushinval_pages(ip,
+                                                        0, -1, FI_REMAPF);
                         } else if ((flags & SYNC_DELWRI) && VN_DIRTY(vp)) {
-                                error = bhv_vop_flush_pages(vp, (xfs_off_t)0,
+                                error = xfs_flush_pages(ip, 0,
                                                         -1, fflag, FI_NONE);
                         }