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

Also remove the now dead behavior code.

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

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

8 files changed, 36 insertions, 221 deletions

diff --git a/fs/xfs/linux-2.6/xfs_export.c b/fs/xfs/linux-2.6/xfs_export.c
index 0919021d56c4..4ed28a6767bb 100644
--- a/fs/xfs/linux-2.6/xfs_export.c
+++ b/fs/xfs/linux-2.6/xfs_export.c
@@ -28,6 +28,7 @@
 #include "xfs_vnodeops.h"
 #include "xfs_bmap_btree.h"
 #include "xfs_inode.h"
+#include "xfs_vfsops.h"
 
 static struct dentry dotdot = { .d_name.name = "..", .d_name.len = 2, };
 
@@ -143,10 +144,9 @@ xfs_fs_get_dentry(
         bhv_vnode_t             *vp;
         struct inode            *inode;
         struct dentry           *result;
-        bhv_vfs_t               *vfsp = vfs_from_sb(sb);
         int                     error;
 
-        error = bhv_vfs_vget(vfsp, &vp, (fid_t *)data);
+        error = xfs_vget(XFS_M(sb), &vp, (fid_t *)data);
         if (error || vp == NULL)
                 return ERR_PTR(-ESTALE) ;
 
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h
index ab634a775d23..dc3752de22da 100644
--- a/fs/xfs/linux-2.6/xfs_linux.h
+++ b/fs/xfs/linux-2.6/xfs_linux.h
@@ -83,7 +83,6 @@
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
 
-#include <xfs_behavior.h>
 #include <xfs_vfs.h>
 #include <xfs_cred.h>
 #include <xfs_vnode.h>
diff --git a/fs/xfs/linux-2.6/xfs_lrw.h b/fs/xfs/linux-2.6/xfs_lrw.h
index 4cd85c3360f5..4b7747a828d9 100644
--- a/fs/xfs/linux-2.6/xfs_lrw.h
+++ b/fs/xfs/linux-2.6/xfs_lrw.h
@@ -18,7 +18,6 @@
 #ifndef __XFS_LRW_H__
 #define __XFS_LRW_H__
 
-struct bhv_desc;
 struct xfs_mount;
 struct xfs_iocore;
 struct xfs_inode;
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 0cb149ad65cc..24bc0afb003c 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -47,6 +47,7 @@
 #include "xfs_buf_item.h"
 #include "xfs_utils.h"
 #include "xfs_vnodeops.h"
+#include "xfs_vfsops.h"
 #include "xfs_version.h"
 
 #include <linux/namei.h>
@@ -204,8 +205,7 @@ void
 xfs_initialize_vnode(
         struct xfs_mount        *mp,
         bhv_vnode_t             *vp,
-        struct xfs_inode        *ip,
-        int                     unlock)
+        struct xfs_inode        *ip)
 {
         struct inode            *inode = vn_to_inode(vp);
 
@@ -221,7 +221,7 @@ xfs_initialize_vnode(
          * second time once the inode is properly set up, and then we can
          * finish our work.
          */
-        if (ip->i_d.di_mode != 0 && unlock && (inode->i_state & I_NEW)) {
+        if (ip->i_d.di_mode != 0 && (inode->i_state & I_NEW)) {
                 xfs_revalidate_inode(mp, vp, ip);
                 xfs_set_inodeops(inode);
 
@@ -535,9 +535,8 @@ vfs_sync_worker(
         int             error;
 
         if (!(vfsp->vfs_flag & VFS_RDONLY))
-                error = bhv_vfs_sync(vfsp, SYNC_FSDATA | SYNC_BDFLUSH | \
-                                        SYNC_ATTR | SYNC_REFCACHE | SYNC_SUPER,
-                                        NULL);
+                error = xfs_sync(XFS_VFSTOM(vfsp), SYNC_FSDATA | SYNC_BDFLUSH | \
+                                        SYNC_ATTR | SYNC_REFCACHE | SYNC_SUPER);
         vfsp->vfs_sync_seq++;
         wake_up(&vfsp->vfs_wait_single_sync_task);
 }
@@ -614,11 +613,12 @@ xfs_fs_put_super(
         struct super_block      *sb)
 {
         bhv_vfs_t               *vfsp = vfs_from_sb(sb);
+        struct xfs_mount        *mp = XFS_M(sb);
         int                     error;
 
         xfs_fs_stop_syncd(vfsp);
-        bhv_vfs_sync(vfsp, SYNC_ATTR | SYNC_DELWRI, NULL);
-        error = bhv_vfs_unmount(vfsp, 0, NULL);
+        xfs_sync(mp, SYNC_ATTR | SYNC_DELWRI);
+        error = xfs_unmount(mp, 0, NULL);
         if (error) {
                 printk("XFS: unmount got error=%d\n", error);
                 printk("%s: vfs=0x%p left dangling!\n", __FUNCTION__, vfsp);
@@ -632,7 +632,7 @@ xfs_fs_write_super(
         struct super_block      *sb)
 {
         if (!(sb->s_flags & MS_RDONLY))
-                bhv_vfs_sync(vfs_from_sb(sb), SYNC_FSDATA, NULL);
+                xfs_sync(XFS_M(sb), SYNC_FSDATA);
         sb->s_dirt = 0;
 }
 
@@ -642,6 +642,7 @@ xfs_fs_sync_super(
         int                     wait)
 {
         bhv_vfs_t               *vfsp = vfs_from_sb(sb);
+        struct xfs_mount        *mp = XFS_M(sb);
         int                     error;
         int                     flags;
 
@@ -658,7 +659,7 @@ xfs_fs_sync_super(
         } else
                 flags = SYNC_FSDATA | (wait ? SYNC_WAIT : 0);
 
-        error = bhv_vfs_sync(vfsp, flags, NULL);
+        error = xfs_sync(mp, flags);
         sb->s_dirt = 0;
 
         if (unlikely(laptop_mode)) {
@@ -688,7 +689,7 @@ xfs_fs_statfs(
         struct dentry           *dentry,
         struct kstatfs          *statp)
 {
-        return -bhv_vfs_statvfs(vfs_from_sb(dentry->d_sb), statp,
+        return -xfs_statvfs(XFS_M(dentry->d_sb), statp,
                                 vn_from_inode(dentry->d_inode));
 }
 
@@ -698,13 +699,13 @@ xfs_fs_remount(
         int                     *flags,
         char                    *options)
 {
-        bhv_vfs_t               *vfsp = vfs_from_sb(sb);
+        struct xfs_mount        *mp = XFS_M(sb);
         struct xfs_mount_args   *args = xfs_args_allocate(sb, 0);
         int                     error;
 
-        error = bhv_vfs_parseargs(vfsp, options, args, 1);
+        error = xfs_parseargs(mp, options, args, 1);
         if (!error)
-                error = bhv_vfs_mntupdate(vfsp, flags, args);
+                error = xfs_mntupdate(mp, flags, args);
         kmem_free(args, sizeof(*args));
         return -error;
 }
@@ -713,7 +714,7 @@ STATIC void
 xfs_fs_lockfs(
         struct super_block      *sb)
 {
-        bhv_vfs_freeze(vfs_from_sb(sb));
+        xfs_freeze(XFS_M(sb));
 }
 
 STATIC int
@@ -721,7 +722,7 @@ xfs_fs_show_options(
         struct seq_file         *m,
         struct vfsmount         *mnt)
 {
-        return -bhv_vfs_showargs(vfs_from_sb(mnt->mnt_sb), m);
+        return -xfs_showargs(XFS_M(mnt->mnt_sb), m);
 }
 
 STATIC int
@@ -783,30 +784,29 @@ xfs_fs_fill_super(
 {
         struct inode            *rootvp;
         struct bhv_vfs          *vfsp = vfs_allocate(sb);
+        struct xfs_mount        *mp = NULL;
         struct xfs_mount_args   *args = xfs_args_allocate(sb, silent);
         struct kstatfs          statvfs;
         int                     error;
 
-        bhv_insert_all_vfsops(vfsp);
+        mp = xfs_mount_init();
+        mp->m_vfsp = vfsp;
+        vfsp->vfs_mount = mp;
 
-        error = bhv_vfs_parseargs(vfsp, (char *)data, args, 0);
-        if (error) {
-                bhv_remove_all_vfsops(vfsp, 1);
+        error = xfs_parseargs(mp, (char *)data, args, 0);
+        if (error)
                 goto fail_vfsop;
-        }
 
         sb_min_blocksize(sb, BBSIZE);
         sb->s_export_op = &xfs_export_operations;
         sb->s_qcop = &xfs_quotactl_operations;
         sb->s_op = &xfs_super_operations;
 
-        error = bhv_vfs_mount(vfsp, args, NULL);
-        if (error) {
-                bhv_remove_all_vfsops(vfsp, 1);
+        error = xfs_mount(mp, args, NULL);
+        if (error)
                 goto fail_vfsop;
-        }
 
-        error = bhv_vfs_statvfs(vfsp, &statvfs, NULL);
+        error = xfs_statvfs(mp, &statvfs, NULL);
         if (error)
                 goto fail_unmount;
 
@@ -818,7 +818,7 @@ xfs_fs_fill_super(
         sb->s_time_gran = 1;
         set_posix_acl_flag(sb);
 
-        error = bhv_vfs_root(vfsp, &rootvp);
+        error = xfs_root(mp, &rootvp);
         if (error)
                 goto fail_unmount;
 
@@ -848,7 +848,7 @@ fail_vnrele:
         }
 
 fail_unmount:
-        bhv_vfs_unmount(vfsp, 0, NULL);
+        xfs_unmount(mp, 0, NULL);
 
 fail_vfsop:
         vfs_deallocate(vfsp);
diff --git a/fs/xfs/linux-2.6/xfs_super.h b/fs/xfs/linux-2.6/xfs_super.h
index dba6f1cc348a..529ada86f2c9 100644
--- a/fs/xfs/linux-2.6/xfs_super.h
+++ b/fs/xfs/linux-2.6/xfs_super.h
@@ -107,6 +107,9 @@ struct block_device;
 
 extern __uint64_t xfs_max_file_offset(unsigned int);
 
+extern void xfs_initialize_vnode(struct xfs_mount *mp, bhv_vnode_t *vp,
+                struct xfs_inode *ip);
+
 extern void xfs_flush_inode(struct xfs_inode *);
 extern void xfs_flush_device(struct xfs_inode *);
 
diff --git a/fs/xfs/linux-2.6/xfs_vfs.c b/fs/xfs/linux-2.6/xfs_vfs.c
index 5f616ccaea8d..573e52a24072 100644
--- a/fs/xfs/linux-2.6/xfs_vfs.c
+++ b/fs/xfs/linux-2.6/xfs_vfs.c
@@ -204,7 +204,6 @@ vfs_allocate(
         struct bhv_vfs          *vfsp;
 
         vfsp = kmem_zalloc(sizeof(bhv_vfs_t), KM_SLEEP);
-        bhv_head_init(VFS_BHVHEAD(vfsp), "vfs");
         INIT_LIST_HEAD(&vfsp->vfs_sync_list);
         spin_lock_init(&vfsp->vfs_sync_lock);
         init_waitqueue_head(&vfsp->vfs_wait_single_sync_task);
@@ -229,71 +228,5 @@ void
 vfs_deallocate(
         struct bhv_vfs          *vfsp)
 {
-        bhv_head_destroy(VFS_BHVHEAD(vfsp));
         kmem_free(vfsp, sizeof(bhv_vfs_t));
 }
-
-void
-vfs_insertops(
-        struct bhv_vfs          *vfsp,
-        struct bhv_module_vfsops *vfsops)
-{
-        struct bhv_desc         *bdp;
-
-        bdp = kmem_alloc(sizeof(struct bhv_desc), KM_SLEEP);
-        bhv_desc_init(bdp, NULL, vfsp, vfsops);
-        bhv_insert(&vfsp->vfs_bh, bdp);
-}
-
-void
-vfs_insertbhv(
-        struct bhv_vfs          *vfsp,
-        struct bhv_desc         *bdp,
-        struct bhv_vfsops       *vfsops,
-        void                    *mount)
-{
-        bhv_desc_init(bdp, mount, vfsp, vfsops);
-        bhv_insert_initial(&vfsp->vfs_bh, bdp);
-}
-
-void
-bhv_remove_vfsops(
-        struct bhv_vfs          *vfsp,
-        int                     pos)
-{
-        struct bhv_desc         *bhv;
-
-        bhv = bhv_lookup_range(&vfsp->vfs_bh, pos, pos);
-        if (!bhv)
-                return;
-        bhv_remove(&vfsp->vfs_bh, bhv);
-        kmem_free(bhv, sizeof(*bhv));
-}
-
-void
-bhv_remove_all_vfsops(
-        struct bhv_vfs          *vfsp,
-        int                     freebase)
-{
-        struct xfs_mount        *mp;
-
-        bhv_remove_vfsops(vfsp, VFS_POSITION_QM);
-        if (!freebase)
-                return;
-        mp = XFS_VFSTOM(vfsp);
-        VFS_REMOVEBHV(vfsp, &mp->m_bhv);
-        xfs_mount_free(mp, 0);
-        kmem_free(mp, sizeof(xfs_mount_t));
-}
-
-void
-bhv_insert_all_vfsops(
-        struct bhv_vfs          *vfsp)
-{
-        struct xfs_mount        *mp;
-
-        mp = xfs_mount_init();
-        vfs_insertbhv(vfsp, &mp->m_bhv, &xfs_vfsops, mp);
-        vfs_insertdmapi(vfsp);
-        vfs_insertquota(vfsp);
-}
diff --git a/fs/xfs/linux-2.6/xfs_vfs.h b/fs/xfs/linux-2.6/xfs_vfs.h
index e63b2d012f0c..04303cb911c7 100644
--- a/fs/xfs/linux-2.6/xfs_vfs.h
+++ b/fs/xfs/linux-2.6/xfs_vfs.h
@@ -29,6 +29,7 @@ struct cred;
 struct seq_file;
 struct super_block;
 struct xfs_inode;
+struct xfs_mount;
 struct xfs_mount_args;
 
 typedef struct kstatfs  bhv_statvfs_t;
@@ -41,10 +42,10 @@ typedef struct bhv_vfs_sync_work {
 } bhv_vfs_sync_work_t;
 
 typedef struct bhv_vfs {
+        struct xfs_mount        *vfs_mount;
         u_int                   vfs_flag;       /* flags */
         xfs_fsid_t              vfs_fsid;       /* file system ID */
         xfs_fsid_t              *vfs_altfsid;   /* An ID fixed for life of FS */
-        bhv_head_t              vfs_bh;         /* head of vfs behavior chain */
         struct super_block      *vfs_super;     /* generic superblock pointer */
         struct task_struct      *vfs_sync_task; /* generalised sync thread */
         bhv_vfs_sync_work_t     vfs_sync_work;  /* work item for VFS_SYNC */
@@ -54,27 +55,6 @@ typedef struct bhv_vfs {
         wait_queue_head_t       vfs_wait_single_sync_task;
 } bhv_vfs_t;
 
-#define bhvtovfs(bdp)           ( (struct bhv_vfs *)BHV_VOBJ(bdp) )
-#define bhvtovfsops(bdp)        ( (struct bhv_vfsops *)BHV_OPS(bdp) )
-#define VFS_BHVHEAD(vfs)        ( &(vfs)->vfs_bh )
-#define VFS_REMOVEBHV(vfs, bdp) ( bhv_remove(VFS_BHVHEAD(vfs), bdp) )
-
-#define VFS_POSITION_BASE       BHV_POSITION_BASE       /* chain bottom */
-#define VFS_POSITION_TOP        BHV_POSITION_TOP        /* chain top */
-#define VFS_POSITION_INVALID    BHV_POSITION_INVALID    /* invalid pos. num */
-
-typedef enum {
-        VFS_BHV_UNKNOWN,        /* not specified */
-        VFS_BHV_XFS,            /* xfs */
-        VFS_BHV_QM,             /* quota manager */
-        VFS_BHV_IO,             /* IO path */
-        VFS_BHV_END             /* housekeeping end-of-range */
-} bhv_vfs_type_t;
-
-#define VFS_POSITION_XFS        (BHV_POSITION_BASE)
-#define VFS_POSITION_QM         (VFS_POSITION_BASE+20)
-#define VFS_POSITION_IO         (VFS_POSITION_BASE+30)
-
 #define VFS_RDONLY              0x0001  /* read-only vfs */
 #define VFS_GRPID               0x0002  /* group-ID assigned from directory */
 #define VFS_DMI                 0x0004  /* filesystem has the DMI enabled */
@@ -114,108 +94,11 @@ typedef enum {
 #define SHUTDOWN_REMOTE_REQ     0x0010  /* shutdown came from remote cell */
 #define SHUTDOWN_DEVICE_REQ     0x0020  /* failed all paths to the device */
 
-typedef int     (*vfs_mount_t)(bhv_desc_t *,
-                                struct xfs_mount_args *, struct cred *);
-typedef int     (*vfs_parseargs_t)(bhv_desc_t *, char *,
-                                struct xfs_mount_args *, int);
-typedef int     (*vfs_showargs_t)(bhv_desc_t *, struct seq_file *);
-typedef int     (*vfs_unmount_t)(bhv_desc_t *, int, struct cred *);
-typedef int     (*vfs_mntupdate_t)(bhv_desc_t *, int *,
-                                struct xfs_mount_args *);
-typedef int     (*vfs_root_t)(bhv_desc_t *, struct inode **);
-typedef int     (*vfs_statvfs_t)(bhv_desc_t *, bhv_statvfs_t *,
-                                struct inode *);
-typedef int     (*vfs_sync_t)(bhv_desc_t *, int, struct cred *);
-typedef int     (*vfs_vget_t)(bhv_desc_t *, struct inode **, struct fid *);
-typedef void    (*vfs_init_vnode_t)(bhv_desc_t *,
-                                struct inode *, struct xfs_inode *, int);
-typedef void    (*vfs_force_shutdown_t)(bhv_desc_t *, int, char *, int);
-typedef void    (*vfs_freeze_t)(bhv_desc_t *);
-
-typedef struct bhv_vfsops {
-        bhv_position_t          vf_position;    /* behavior chain position */
-        vfs_mount_t             vfs_mount;      /* mount file system */
-        vfs_parseargs_t         vfs_parseargs;  /* parse mount options */
-        vfs_showargs_t          vfs_showargs;   /* unparse mount options */
-        vfs_unmount_t           vfs_unmount;    /* unmount file system */
-        vfs_mntupdate_t         vfs_mntupdate;  /* update file system options */
-        vfs_root_t              vfs_root;       /* get root vnode */
-        vfs_statvfs_t           vfs_statvfs;    /* file system statistics */
-        vfs_sync_t              vfs_sync;       /* flush files */
-        vfs_vget_t              vfs_vget;       /* get vnode from fid */
-        vfs_init_vnode_t        vfs_init_vnode; /* initialize a new vnode */
-        vfs_force_shutdown_t    vfs_force_shutdown;     /* crash and burn */
-        vfs_freeze_t            vfs_freeze;     /* freeze fs for snapshot */
-} bhv_vfsops_t;
-
-/*
- * Virtual filesystem operations, operating from head bhv.
- */
-#define VFSHEAD(v)                      ((v)->vfs_bh.bh_first)
-#define bhv_vfs_mount(v, ma,cr)         vfs_mount(VFSHEAD(v), ma,cr)
-#define bhv_vfs_parseargs(v, o,ma,f)    vfs_parseargs(VFSHEAD(v), o,ma,f)
-#define bhv_vfs_showargs(v, m)          vfs_showargs(VFSHEAD(v), m)
-#define bhv_vfs_unmount(v, f,cr)        vfs_unmount(VFSHEAD(v), f,cr)
-#define bhv_vfs_mntupdate(v, fl,args)   vfs_mntupdate(VFSHEAD(v), fl,args)
-#define bhv_vfs_root(v, vpp)            vfs_root(VFSHEAD(v), vpp)
-#define bhv_vfs_statvfs(v, sp,vp)       vfs_statvfs(VFSHEAD(v), sp,vp)
-#define bhv_vfs_sync(v, flag,cr)        vfs_sync(VFSHEAD(v), flag,cr)
-#define bhv_vfs_vget(v, vpp,fidp)       vfs_vget(VFSHEAD(v), vpp,fidp)
-#define bhv_vfs_init_vnode(v, vp,b,ul)  vfs_init_vnode(VFSHEAD(v), vp,b,ul)
-#define bhv_vfs_force_shutdown(v,u,f,l) vfs_force_shutdown(VFSHEAD(v), u,f,l)
-#define bhv_vfs_freeze(v)               vfs_freeze(VFSHEAD(v))
-
-/*
- * Virtual filesystem operations, operating from next bhv.
- */
-#define bhv_next_vfs_mount(b, ma,cr)            vfs_mount(b, ma,cr)
-#define bhv_next_vfs_parseargs(b, o,ma,f)       vfs_parseargs(b, o,ma,f)
-#define bhv_next_vfs_showargs(b, m)             vfs_showargs(b, m)
-#define bhv_next_vfs_unmount(b, f,cr)           vfs_unmount(b, f,cr)
-#define bhv_next_vfs_mntupdate(b, fl,args)      vfs_mntupdate(b, fl, args)
-#define bhv_next_vfs_root(b, vpp)               vfs_root(b, vpp)
-#define bhv_next_vfs_statvfs(b, sp,vp)          vfs_statvfs(b, sp,vp)
-#define bhv_next_vfs_sync(b, flag,cr)           vfs_sync(b, flag,cr)
-#define bhv_next_vfs_vget(b, vpp,fidp)          vfs_vget(b, vpp,fidp)
-#define bhv_next_vfs_init_vnode(b, vp,b2,ul)    vfs_init_vnode(b, vp,b2,ul)
-#define bhv_next_force_shutdown(b, fl,f,l)      vfs_force_shutdown(b, fl,f,l)
-#define bhv_next_vfs_freeze(b)                  vfs_freeze(b)
-
-extern int vfs_mount(bhv_desc_t *, struct xfs_mount_args *, struct cred *);
-extern int vfs_parseargs(bhv_desc_t *, char *, struct xfs_mount_args *, int);
-extern int vfs_showargs(bhv_desc_t *, struct seq_file *);
-extern int vfs_unmount(bhv_desc_t *, int, struct cred *);
-extern int vfs_mntupdate(bhv_desc_t *, int *, struct xfs_mount_args *);
-extern int vfs_root(bhv_desc_t *, struct inode **);
-extern int vfs_statvfs(bhv_desc_t *, bhv_statvfs_t *, struct inode *);
-extern int vfs_sync(bhv_desc_t *, int, struct cred *);
-extern int vfs_vget(bhv_desc_t *, struct inode **, struct fid *);
-extern void vfs_init_vnode(bhv_desc_t *, struct inode *, struct xfs_inode *, int);
-extern void vfs_force_shutdown(bhv_desc_t *, int, char *, int);
-extern void vfs_freeze(bhv_desc_t *);
-
 #define vfs_test_for_freeze(vfs)        ((vfs)->vfs_super->s_frozen)
 #define vfs_wait_for_freeze(vfs,l)      vfs_check_frozen((vfs)->vfs_super, (l))
  
-typedef struct bhv_module_vfsops {
-        struct bhv_vfsops       bhv_common;
-        void *                  bhv_custom;
-} bhv_module_vfsops_t;
-
-#define vfs_bhv_lookup(v, id)   (bhv_lookup_range(&(v)->vfs_bh, (id), (id)))
-#define vfs_bhv_custom(b)       (((bhv_module_vfsops_t*)BHV_OPS(b))->bhv_custom)
-#define vfs_bhv_set_custom(b,o) ((b)->bhv_custom = (void *)(o))
-#define vfs_bhv_clr_custom(b)   ((b)->bhv_custom = NULL)
-
 extern bhv_vfs_t *vfs_allocate(struct super_block *);
 extern bhv_vfs_t *vfs_from_sb(struct super_block *);
 extern void vfs_deallocate(bhv_vfs_t *);
-extern void vfs_insertbhv(bhv_vfs_t *, bhv_desc_t *, bhv_vfsops_t *, void *);
-
-extern void vfs_insertops(bhv_vfs_t *, bhv_module_vfsops_t *);
-
-extern void bhv_insert_all_vfsops(struct bhv_vfs *);
-extern void bhv_remove_all_vfsops(struct bhv_vfs *, int);
-extern void bhv_remove_vfsops(struct bhv_vfs *, int);
 
 #endif  /* __XFS_VFS_H__ */
diff --git a/fs/xfs/linux-2.6/xfs_vnode.c b/fs/xfs/linux-2.6/xfs_vnode.c
index b7ff26780a0c..814169fd7e1e 100644
--- a/fs/xfs/linux-2.6/xfs_vnode.c
+++ b/fs/xfs/linux-2.6/xfs_vnode.c
@@ -78,10 +78,8 @@ vn_ioerror(
         char            *f,
         int             l)
 {
-        bhv_vfs_t       *vfsp = XFS_MTOVFS(ip->i_mount);
-
         if (unlikely(error == -ENODEV))
-                bhv_vfs_force_shutdown(vfsp, SHUTDOWN_DEVICE_REQ, f, l);
+                xfs_do_force_shutdown(ip->i_mount, SHUTDOWN_DEVICE_REQ, f, l);
 }
 
 bhv_vnode_t *