提交 7d308590 编写于 作者: F Fabio Massimo Di Nitto 提交者: Steven Whitehouse

[GFS2] Export lm_interface to kernel headers


lm_interface.h has a few out of the tree clients such as GFS1
and userland tools.

Right now, these clients keeps a copy of the file in their build tree
that can go out of sync.

Move lm_interface.h to include/linux, export it to userland and
clean up fs/gfs2 to use the new location.
Signed-off-by: NFabio M. Di Nitto <fabbione@ubuntu.com>
Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>
上级 f3b30912
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
#include <linux/posix_acl.h> #include <linux/posix_acl.h>
#include <linux/posix_acl_xattr.h> #include <linux/posix_acl_xattr.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "acl.h" #include "acl.h"
#include "eaops.h" #include "eaops.h"
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "bmap.h" #include "bmap.h"
#include "glock.h" #include "glock.h"
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "daemon.h" #include "daemon.h"
#include "glock.h" #include "glock.h"
......
...@@ -61,9 +61,9 @@ ...@@ -61,9 +61,9 @@
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "dir.h" #include "dir.h"
#include "glock.h" #include "glock.h"
......
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/xattr.h> #include <linux/xattr.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "acl.h" #include "acl.h"
#include "eaops.h" #include "eaops.h"
......
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/xattr.h> #include <linux/xattr.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "acl.h" #include "acl.h"
#include "eaops.h" #include "eaops.h"
......
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/lm_interface.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "glock.h" #include "glock.h"
#include "glops.h" #include "glops.h"
......
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "bmap.h" #include "bmap.h"
#include "glock.h" #include "glock.h"
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
#include <linux/sort.h> #include <linux/sort.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "acl.h" #include "acl.h"
#include "bmap.h" #include "bmap.h"
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "glock.h" #include "glock.h"
#include "lm.h" #include "lm.h"
......
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/lm_interface.h>
#include "lm_interface.h"
struct lmh_wrapper { struct lmh_wrapper {
struct list_head lw_list; struct list_head lw_list;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <net/sock.h> #include <net/sock.h>
#include <linux/dlm.h> #include <linux/dlm.h>
#include "../../lm_interface.h" #include <linux/lm_interface.h>
/* /*
* Internally, we prefix things with gdlm_ and GDLM_ (for gfs-dlm) since a * Internally, we prefix things with gdlm_ and GDLM_ (for gfs-dlm) since a
......
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/lm_interface.h>
#include "../../lm_interface.h"
struct nolock_lockspace { struct nolock_lockspace {
unsigned int nl_lvb_size; unsigned int nl_lvb_size;
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "bmap.h" #include "bmap.h"
#include "glock.h" #include "glock.h"
......
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "glock.h" #include "glock.h"
#include "log.h" #include "log.h"
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "ops_fstype.h" #include "ops_fstype.h"
#include "sys.h" #include "sys.h"
......
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
#include <linux/swap.h> #include <linux/swap.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "glock.h" #include "glock.h"
#include "glops.h" #include "glops.h"
......
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "mount.h" #include "mount.h"
#include "sys.h" #include "sys.h"
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
#include <linux/mpage.h> #include <linux/mpage.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "bmap.h" #include "bmap.h"
#include "glock.h" #include "glock.h"
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "dir.h" #include "dir.h"
#include "glock.h" #include "glock.h"
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "dir.h" #include "dir.h"
#include "glock.h" #include "glock.h"
......
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
#include <linux/ext2_fs.h> #include <linux/ext2_fs.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/iflags.h> #include <linux/iflags.h>
#include <linux/lm_interface.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "bmap.h" #include "bmap.h"
#include "dir.h" #include "dir.h"
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "daemon.h" #include "daemon.h"
#include "glock.h" #include "glock.h"
......
...@@ -19,10 +19,10 @@ ...@@ -19,10 +19,10 @@
#include <linux/posix_acl.h> #include <linux/posix_acl.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/lm_interface.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "acl.h" #include "acl.h"
#include "bmap.h" #include "bmap.h"
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "glock.h" #include "glock.h"
#include "inode.h" #include "inode.h"
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "bmap.h" #include "bmap.h"
#include "glock.h" #include "glock.h"
......
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
#include <linux/sort.h> #include <linux/sort.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "bmap.h" #include "bmap.h"
#include "glock.h" #include "glock.h"
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "bmap.h" #include "bmap.h"
#include "glock.h" #include "glock.h"
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "glock.h" #include "glock.h"
#include "glops.h" #include "glops.h"
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/bio.h> #include <linux/bio.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "bmap.h" #include "bmap.h"
#include "dir.h" #include "dir.h"
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/kobject.h> #include <linux/kobject.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "lm.h" #include "lm.h"
#include "sys.h" #include "sys.h"
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#include <linux/lm_interface.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "glock.h" #include "glock.h"
#include "log.h" #include "log.h"
......
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "gfs2.h" #include "gfs2.h"
#include "lm_interface.h"
#include "incore.h" #include "incore.h"
#include "glock.h" #include "glock.h"
#include "lm.h" #include "lm.h"
......
...@@ -45,9 +45,9 @@ unifdef-y += acct.h adb.h adfs_fs.h agpgart.h apm_bios.h atalk.h \ ...@@ -45,9 +45,9 @@ unifdef-y += acct.h adb.h adfs_fs.h agpgart.h apm_bios.h atalk.h \
inet_diag.h in.h inotify.h input.h ipc.h ipmi.h ipv6.h \ inet_diag.h in.h inotify.h input.h ipc.h ipmi.h ipv6.h \
ipv6_route.h isdn.h isdnif.h isdn_ppp.h isicom.h jbd.h \ ipv6_route.h isdn.h isdnif.h isdn_ppp.h isicom.h jbd.h \
joystick.h kdev_t.h kd.h kernelcapi.h kernel.h keyboard.h \ joystick.h kdev_t.h kd.h kernelcapi.h kernel.h keyboard.h \
llc.h loop.h lp.h mempolicy.h mii.h mman.h mroute.h msdos_fs.h \ llc.h lm_interface.h loop.h lp.h mempolicy.h mii.h mman.h \
msg.h nbd.h ncp_fs.h ncp.h ncp_mount.h netdevice.h \ mroute.h msdos_fs.h msg.h nbd.h ncp_fs.h ncp.h ncp_mount.h \
netfilter_bridge.h netfilter_decnet.h netfilter.h \ netdevice.h netfilter_bridge.h netfilter_decnet.h netfilter.h \
netfilter_ipv4.h netfilter_ipv6.h netfilter_logging.h net.h \ netfilter_ipv4.h netfilter_ipv6.h netfilter_logging.h net.h \
netlink.h nfs3.h nfs4.h nfsacl.h nfs_fs.h nfs.h nfs_idmap.h \ netlink.h nfs3.h nfs4.h nfsacl.h nfs_fs.h nfs.h nfs_idmap.h \
n_r3964.h nubus.h nvram.h parport.h patchkey.h pci.h pktcdvd.h \ n_r3964.h nubus.h nvram.h parport.h patchkey.h pci.h pktcdvd.h \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册