Now move all that stuff that's not needed if DMAPI is not present at
build time into a separate patch to be maintained out of tree.
Signed-off-by: Alex Elder <aelder@xxxxxxx>
---
fs/xfs/xfs_dmapi.h | 79 ----------
fs/xfs/xfs_dmops.c | 406 -----------------------------------------------------
2 files changed, 1 insertion(+), 484 deletions(-)
Index: b/fs/xfs/xfs_dmapi.h
===================================================================
--- a/fs/xfs/xfs_dmapi.h
+++ b/fs/xfs/xfs_dmapi.h
@@ -29,84 +29,7 @@ extern void xfs_dmops_put(struct xfs_mou
#define XFS_DMAPI /* XFS DMAPI support enabled (module or not) */
-#include <dmapi.h>
-#include <dmapi_kern.h>
-
-extern struct xfs_dmops xfs_dmcore_xfs;
-
-typedef int (*xfs_send_data_t)(int, struct xfs_inode *,
- xfs_off_t, size_t, int, int);
-typedef int (*xfs_send_mmap_t)(struct vm_area_struct *, uint);
-typedef int (*xfs_send_destroy_t)(struct xfs_inode *, dm_right_t);
-typedef int (*xfs_send_namesp_t)(dm_eventtype_t, struct xfs_mount *,
- struct xfs_inode *, dm_right_t,
- struct xfs_inode *, dm_right_t,
- const char *, const char *, mode_t, int, int);
-typedef int (*xfs_send_mount_t)(struct xfs_mount *, dm_right_t,
- char *, char *);
-typedef void (*xfs_send_unmount_t)(struct xfs_mount *, struct xfs_inode *,
- dm_right_t, mode_t, int, int);
-
-typedef struct xfs_dmops {
- xfs_send_data_t xfs_send_data;
- xfs_send_mmap_t xfs_send_mmap;
- xfs_send_destroy_t xfs_send_destroy;
- xfs_send_namesp_t xfs_send_namesp;
- xfs_send_mount_t xfs_send_mount;
- xfs_send_unmount_t xfs_send_unmount;
-} xfs_dmops_t;
-
-/*
- * DMAPI events only apply if DMAPI support was specified at mount
- * time. If active, a particular DMAPI event can be enabled for
- * all files the file system, or for individual files.
- */
-static inline int
-xfs_dmapi_event_enabled(struct xfs_inode *ip, dm_eventtype_t event)
-{
- unsigned int event_mask = 1 << event;
-
- return ip->i_mount->m_dm_ops &&
- (ip->i_mount->m_dmevmask & event_mask ||
- ip->i_d.di_dmevmask & event_mask);
-}
-
-/* Customized event functions, based on the DMAPI interfaces */
-
-extern int xfs_dmapi_event_mount(struct xfs_mount *, char *);
-extern void xfs_dmapi_event_preunmount(struct xfs_mount *);
-extern void xfs_dmapi_event_unmount(struct xfs_mount *);
-
-extern int xfs_dmapi_event_create(struct xfs_inode *, const char *,
- mode_t mode);
-extern void xfs_dmapi_event_postcreate(struct xfs_inode *,
- struct xfs_inode *, const char *, mode_t, int);
-extern int xfs_dmapi_event_remove(struct xfs_inode *, const char *,
- mode_t);
-extern void xfs_dmapi_event_postremove(struct xfs_inode *,
- const char *, mode_t, int);
-extern int xfs_dmapi_event_rename(struct xfs_inode *, const char *,
- struct xfs_inode *, const char *);
-extern void xfs_dmapi_event_postrename(struct xfs_inode *, const
- char *, struct xfs_inode *, const char *, int);
-extern int xfs_dmapi_event_link(struct xfs_inode *, struct xfs_inode *,
- const char *);
-extern void xfs_dmapi_event_postlink(struct xfs_inode *, struct xfs_inode *,
- const char *, int);
-extern int xfs_dmapi_event_symlink(const char *, struct xfs_inode *,
- const char *);
-extern void xfs_dmapi_event_postsymlink(const char *, struct xfs_inode *,
- struct xfs_inode *, const char *, int);
-extern int xfs_dmapi_event_mmap(struct vm_area_struct *, unsigned long);
-extern int xfs_dmapi_event_read(struct xfs_inode *, xfs_off_t, size_t,
- int, int, int);
-extern int xfs_dmapi_event_read_simple(struct xfs_inode *);
-extern int xfs_dmapi_event_write(struct xfs_inode *, xfs_off_t, size_t,
- int, int, int);
-extern int xfs_dmapi_event_truncate(struct xfs_inode *, xfs_off_t, int);
-extern void xfs_dmapi_event_attribute(struct xfs_inode *, int);
-extern void xfs_dmapi_event_destroy(struct xfs_inode *);
-extern int xfs_dmapi_event_nospace(struct xfs_inode *);
+#include "dmapi/xfs_dmapi_event.h"
#else /* !(defined(CONFIG_XFS_DMAPI) || defined(CONFIG_XFS_DMAPI_MODULE)) */
Index: b/fs/xfs/xfs_dmops.c
===================================================================
--- a/fs/xfs/xfs_dmops.c
+++ b/fs/xfs/xfs_dmops.c
@@ -64,409 +64,3 @@ xfs_dmops_put(struct xfs_mount *mp)
ASSERT(!mp->m_dm_ops);
}
-#ifdef XFS_DMAPI
-
-#define DM_OPS(mp) ((struct xfs_dmops *) (mp)->m_dm_ops)
-
-/* Private functions that encapsulate conditionally sending DMAPI messages */
-
-static inline int
-xfs_dmapi_send_data(
- struct xfs_inode *ip,
- dm_eventtype_t event,
- xfs_off_t offset,
- size_t length,
- int flags,
- int lock_flags)
-{
- xfs_send_data_t send_data;
-
- if (! xfs_dmapi_event_enabled(ip, event))
- return 0;
- send_data = DM_OPS(ip->i_mount)->xfs_send_data;
-
- return send_data(event, ip, offset, length, flags, lock_flags);
-}
-
-static inline int
-xfs_dmapi_send_mmap(
- struct vm_area_struct *vma,
- unsigned long vm_flags)
-{
- struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
- struct xfs_mount *mp = XFS_M(inode->i_sb);
-
- if (mp->m_dm_ops) {
- xfs_send_mmap_t send_mmap = DM_OPS(mp)->xfs_send_mmap;
-
- return send_mmap(vma, vm_flags);
- }
- ASSERT_ALWAYS(vm_flags == VM_WRITE);
-
- return 0;
-}
-
-static inline int
-xfs_dmapi_send_destroy(
- struct xfs_inode *ip,
- dm_right_t right)
-{
- xfs_send_destroy_t send_destroy;
-
- if (!xfs_dmapi_event_enabled(ip, DM_EVENT_DESTROY))
- return 0;
- send_destroy = DM_OPS(ip->i_mount)->xfs_send_destroy;
-
- return send_destroy(ip, right);
-}
-
-static inline int
-xfs_dmapi_send_namesp(
- struct xfs_inode *ip1,
- dm_right_t right1,
- const char *name1,
- dm_eventtype_t event,
- struct xfs_inode *ip2,
- dm_right_t right2,
- const char *name2,
- mode_t mode,
- int ret,
- int flags)
-{
- int enabled;
- xfs_send_namesp_t send_namesp;
-
- ASSERT(ip1 != NULL);
- if (ip2 && ip1->i_mount != ip2->i_mount)
- return -EINVAL;
-
- switch (event) {
- case DM_EVENT_PREUNMOUNT: /* xfs_dmapi_send_preunmount() */
- enabled = 1;
- break;
- case DM_EVENT_CREATE:
- case DM_EVENT_POSTCREATE:
- case DM_EVENT_REMOVE:
- case DM_EVENT_POSTREMOVE:
- case DM_EVENT_LINK:
- case DM_EVENT_POSTLINK:
- case DM_EVENT_SYMLINK:
- case DM_EVENT_POSTSYMLINK:
- case DM_EVENT_ATTRIBUTE:
- case DM_EVENT_NOSPACE:
- enabled = xfs_dmapi_event_enabled(ip1, event);
- break;
- case DM_EVENT_RENAME:
- case DM_EVENT_POSTRENAME:
- enabled = xfs_dmapi_event_enabled(ip1, event) ||
- xfs_dmapi_event_enabled(ip2, event);
- break;
- default:
- ASSERT(0);
- enabled = 0;
- break;
- }
- if (!enabled)
- return 0;
-
- send_namesp = DM_OPS(ip1->i_mount)->xfs_send_namesp;
-
- return send_namesp(event, NULL, ip1, right1, ip2, right2,
- name1, name2, mode, ret, flags);
-}
-
-static inline int
-xfs_dmapi_send_mount(
- struct xfs_mount *mp,
- char *path)
-{
- if (mp->m_dm_ops) {
- xfs_send_mount_t send_mount = DM_OPS(mp)->xfs_send_mount;
-
- return send_mount(mp, DM_RIGHT_NULL, path, mp->m_fsname);
- }
-
- return ENOSYS;
-}
-
-#define XFS_DMAPI_UNMOUNT_FLAGS(mp) \
- (((mp)->m_dmevmask & (1 << DM_EVENT_UNMOUNT)) ? 0 : DM_FLAGS_UNWANTED)
-
-static inline void
-xfs_dmapi_send_preunmount(
- struct xfs_mount *mp)
-{
- if (mp->m_dm_ops)
- (void) xfs_dmapi_send_namesp(mp->m_rootip, DM_RIGHT_NULL, NULL,
- DM_EVENT_PREUNMOUNT,
- mp->m_rootip, DM_RIGHT_NULL, NULL,
- 0, 0, XFS_DMAPI_UNMOUNT_FLAGS(mp));
-}
-
-static inline void
-xfs_dmapi_send_unmount(
- struct xfs_mount *mp)
-{
- if (mp->m_dm_ops) {
- xfs_send_unmount_t send_unmount =
- DM_OPS(mp)->xfs_send_unmount;
-
- send_unmount(mp, mp->m_rootip, DM_RIGHT_NULL,
- 0, 0, XFS_DMAPI_UNMOUNT_FLAGS(mp));
- }
-}
-
-/*
- * Exported event functions, which translate file system events into
- * the DMAPI messages they should send.
- */
-
-/* Mount point events */
-
-int
-xfs_dmapi_event_mount(
- struct xfs_mount *mp,
- char *path)
-{
- return xfs_dmapi_send_mount(mp, path);
-}
-
-void
-xfs_dmapi_event_preunmount(
- struct xfs_mount *mp)
-{
- xfs_dmapi_send_preunmount(mp);
-}
-
-void
-xfs_dmapi_event_unmount(
- struct xfs_mount *mp)
-{
- xfs_dmapi_send_unmount(mp);
-}
-
-/* Inode events */
-
-int
-xfs_dmapi_event_create(
- struct xfs_inode *dip,
- const char *name,
- mode_t mode)
-{
- return xfs_dmapi_send_namesp(dip, DM_RIGHT_NULL, name,
- DM_EVENT_CREATE,
- NULL, DM_RIGHT_NULL, NULL,
- mode, 0, 0);
-}
-
-void
-xfs_dmapi_event_postcreate(
- struct xfs_inode *dip,
- struct xfs_inode *ip,
- const char *name,
- mode_t mode,
- int retcode)
-{
- (void) xfs_dmapi_send_namesp(dip, DM_RIGHT_NULL, name,
- DM_EVENT_POSTCREATE,
- ip, DM_RIGHT_NULL, NULL,
- mode, retcode, 0);
-}
-
-int
-xfs_dmapi_event_remove(
- struct xfs_inode *dip,
- const char *name,
- mode_t mode)
-{
- return xfs_dmapi_send_namesp(dip, DM_RIGHT_NULL, name,
- DM_EVENT_REMOVE,
- NULL, DM_RIGHT_NULL, NULL,
- mode, 0, 0);
-}
-
-void
-xfs_dmapi_event_postremove(
- struct xfs_inode *dip,
- const char *name,
- mode_t mode,
- int retcode)
-{
- (void) xfs_dmapi_send_namesp(dip, DM_RIGHT_NULL, name,
- DM_EVENT_POSTREMOVE,
- NULL, DM_RIGHT_NULL, NULL,
- mode, retcode, 0);
-}
-
-int
-xfs_dmapi_event_rename(
- struct xfs_inode *src_dip,
- const char *src_name,
- struct xfs_inode *tgt_dip,
- const char *tgt_name)
-{
- return xfs_dmapi_send_namesp(src_dip, DM_RIGHT_NULL, src_name,
- DM_EVENT_RENAME,
- tgt_dip, DM_RIGHT_NULL, tgt_name,
- 0, 0, 0);
-}
-
-void
-xfs_dmapi_event_postrename(
- struct xfs_inode *src_dip,
- const char *src_name,
- struct xfs_inode *tgt_dip,
- const char *tgt_name,
- int retcode)
-{
- (void) xfs_dmapi_send_namesp(src_dip, DM_RIGHT_NULL, src_name,
- DM_EVENT_POSTRENAME,
- tgt_dip, DM_RIGHT_NULL, tgt_name,
- 0, retcode, 0);
-}
-
-int
-xfs_dmapi_event_link(
- struct xfs_inode *src_ip,
- struct xfs_inode *tgt_dip,
- const char *tgt_name)
-{
- return xfs_dmapi_send_namesp(tgt_dip, DM_RIGHT_NULL, tgt_name,
- DM_EVENT_LINK,
- src_ip, DM_RIGHT_NULL, NULL,
- 0, 0, 0);
-}
-
-void
-xfs_dmapi_event_postlink(
- struct xfs_inode *src_ip,
- struct xfs_inode *tgt_dip,
- const char *tgt_name,
- int retcode)
-{
- (void) xfs_dmapi_send_namesp(tgt_dip, DM_RIGHT_NULL, tgt_name,
- DM_EVENT_POSTLINK,
- src_ip, DM_RIGHT_NULL, NULL,
- 0, retcode, 0);
-}
-
-int
-xfs_dmapi_event_symlink(
- const char *path, /* pointed-to path */
- struct xfs_inode *tgt_dip,
- const char *tgt_name)
-{
- return xfs_dmapi_send_namesp(tgt_dip, DM_RIGHT_NULL, tgt_name,
- DM_EVENT_SYMLINK,
- NULL, DM_RIGHT_NULL, path,
- 0, 0, 0);
-}
-
-void
-xfs_dmapi_event_postsymlink(
- const char *path, /* pointed-to path */
- struct xfs_inode *tgt_dip,
- struct xfs_inode *tgt_ip, /* ignored if retcode != 0 */
- const char *tgt_name,
- int retcode)
-{
- (void) xfs_dmapi_send_namesp(tgt_dip, DM_RIGHT_NULL, tgt_name,
- DM_EVENT_POSTSYMLINK,
- retcode ? NULL : tgt_ip, DM_RIGHT_NULL, path,
- 0, retcode, 0);
-}
-
-int
-xfs_dmapi_event_mmap(
- struct vm_area_struct *vma,
- unsigned long vm_flags)
-{
- return xfs_dmapi_send_mmap(vma, vm_flags);
-}
-
-int
-xfs_dmapi_event_read(
- struct xfs_inode *ip,
- xfs_off_t offset,
- size_t length,
- int non_blocking,
- int direct_io,
- int lock_flags)
-{
- int dmflags = non_blocking ? DM_FLAGS_NDELAY : 0;
-
- if (direct_io)
- dmflags |= DM_FLAGS_IMUX;
-
- return xfs_dmapi_send_data(ip, DM_EVENT_READ, offset,
- length, dmflags, lock_flags);
-}
-
-int
-xfs_dmapi_event_read_simple(
- struct xfs_inode *ip)
-{
- return xfs_dmapi_event_read(ip, 0, 0, 0, 0, 0);
-}
-
-int
-xfs_dmapi_event_write(
- struct xfs_inode *ip,
- xfs_off_t offset,
- size_t length,
- int non_blocking,
- int direct_io,
- int lock_flags)
-{
- int dmflags = non_blocking ? DM_FLAGS_NDELAY : 0;
-
- if (direct_io)
- dmflags |= DM_FLAGS_IMUX;
-
- return xfs_dmapi_send_data(ip, DM_EVENT_WRITE, offset,
- length, dmflags, lock_flags);
-}
-
-int
-xfs_dmapi_event_truncate(
- struct xfs_inode *ip,
- xfs_off_t size,
- int non_blocking)
-{
- int dmflags = DM_FLAGS_IALLOCSEM_WR|DM_FLAGS_IMUX;
-
- if (non_blocking)
- dmflags |= DM_FLAGS_NDELAY;
-
- return xfs_dmapi_send_data(ip, DM_EVENT_TRUNCATE, size, 0, dmflags, 0);
-}
-
-void
-xfs_dmapi_event_attribute(
- struct xfs_inode *ip,
- int delay)
-{
- (void) xfs_dmapi_send_namesp(ip, DM_RIGHT_NULL, NULL,
- DM_EVENT_ATTRIBUTE,
- NULL, DM_RIGHT_NULL, NULL,
- 0, 0, delay ? DM_FLAGS_NDELAY : 0);
-}
-
-void
-xfs_dmapi_event_destroy(
- struct xfs_inode *ip)
-{
- (void) xfs_dmapi_send_destroy(ip, DM_RIGHT_NULL);
-}
-
-int
-xfs_dmapi_event_nospace(
- struct xfs_inode *ip)
-{
- return xfs_dmapi_send_namesp(ip, DM_RIGHT_NULL, NULL,
- DM_EVENT_NOSPACE,
- ip, DM_RIGHT_NULL, NULL,
- 0, 0, 0); /* Delay flag intentionally unused */
-}
-
-#endif /* XFS_DMAPI */
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
