Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[sfrench/cifs-2.6.git] / fs / xfs / xfs_dmops.c

diff --git a/fs/xfs/xfs_dmops.c b/fs/xfs/xfs_dmops.c
index 629795b3b3d5987f937a7ff15f3f81fc21dc222a..a1e55fb9d5dde43c95565c1aece67d4345232391 100644 (file)
--- a/fs/xfs/xfs_dmops.c
+++ b/fs/xfs/xfs_dmops.c
@@ -19,19 +19,38 @@
 #include "xfs_fs.h"
 #include "xfs_types.h"
 #include "xfs_log.h"
-#include "xfs_inum.h"
 #include "xfs_trans.h"
 #include "xfs_sb.h"
-#include "xfs_ag.h"
-#include "xfs_dir.h"
-#include "xfs_dir2.h"
 #include "xfs_dmapi.h"
+#include "xfs_inum.h"
+#include "xfs_ag.h"
 #include "xfs_mount.h"
+#include "xfs_clnt.h"
 
-xfs_dmops_t    xfs_dmcore_stub = {
+
+static struct xfs_dmops xfs_dmcore_stub = {
        .xfs_send_data          = (xfs_send_data_t)fs_nosys,
        .xfs_send_mmap          = (xfs_send_mmap_t)fs_noerr,
        .xfs_send_destroy       = (xfs_send_destroy_t)fs_nosys,
        .xfs_send_namesp        = (xfs_send_namesp_t)fs_nosys,
-       .xfs_send_unmount       = (xfs_send_unmount_t)fs_noval,
+       .xfs_send_mount         = (xfs_send_mount_t)fs_nosys,
+       .xfs_send_unmount       = (xfs_send_unmount_t)fs_noerr,
 };
+
+int
+xfs_dmops_get(struct xfs_mount *mp, struct xfs_mount_args *args)
+{
+       if (args->flags & XFSMNT_DMAPI) {
+               cmn_err(CE_WARN,
+                       "XFS: dmapi support not available in this kernel.");
+               return EINVAL;
+       }
+
+       mp->m_dm_ops = &xfs_dmcore_stub;
+       return 0;
+}
+
+void
+xfs_dmops_put(struct xfs_mount *mp)
+{
+}