kclient: moved ceph_fs.h for easier out-of-tree build as module

diff --git a/configure.ac b/configure.ac
index 1cfb5d5bce5131ec19c52d7394efa6dde9aa95eb..c085e6798b2d189bfb23add375f5e8bb1a368016 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
 # Automake
-AM_INIT_AUTOMAKE(ceph, 0.1)
+AM_INIT_AUTOMAKE(ceph, 0.2)
 AM_PROG_CC_C_O
 
 # Platform

diff --git a/src/Makefile.am b/src/Makefile.am
index 52978ffcde34e74ec9ab097c4ba821648cf3d800..09e7b5128d83bfd3c0b693076b05b2f7d69c2b23 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -257,6 +257,8 @@ noinst_HEADERS = \
        crush/CrushWrapper.h\
        crush/CrushWrapper.i\
        crush/crush.h\
+       crush/grammar.h\
+       crush/sample.txt\
        ebofs/Table.h\
        ebofs/csum.h\
        ebofs/BlockDevice.h\
@@ -296,17 +298,36 @@ noinst_HEADERS = \
        include/page.h\
        include/xlist.h\
        include/types.h\
+       kernel/crush/crush.c\
        kernel/crush/crush.h\
-       kernel/crush/hash.h\
+       kernel/crush/mapper.c\
        kernel/crush/mapper.h\
-       kernel/osdmap.h\
-       kernel/mdsmap.h\
-       kernel/super.h\
-       kernel/mon_client.h\
-       kernel/messenger.h\
+       kernel/crush/hash.h\
+       kernel/Makefile\
+       kernel/addr.c\
+       kernel/client.c\
+       kernel/decode.h\
+       kernel/dir.c\
+       kernel/export.c\
+       kernel/file.c\
+       kernel/inode.c\
+       kernel/ktcp.c\
        kernel/ktcp.h\
+       kernel/mds_client.c\
        kernel/mds_client.h\
+       kernel/mdsmap.c\
+       kernel/mdsmap.h\
+       kernel/messenger.c\
+       kernel/messenger.h\
+       kernel/mon_client.c\
+       kernel/mon_client.h\
+       kernel/osd_client.c\
        kernel/osd_client.h\
+       kernel/osdmap.c\
+       kernel/osdmap.h\
+       kernel/proc.c\
+       kernel/super.c\
+       kernel/super.h\
        mds/Anchor.h\
        mds/AnchorClient.h\
        mds/AnchorTable.h\
@@ -377,6 +398,7 @@ noinst_HEADERS = \
        messages/MMDSBoot.h\
        messages/MClientMount.h\
        messages/MClientFileCaps.h\
+       messages/MClientLease.h\
        messages/MOSDMap.h\
        messages/MOSDOp.h\
        messages/MOSDOut.h\
@@ -413,6 +435,7 @@ noinst_HEADERS = \
        messages/MClientSession.h\
        messages/MMonPaxos.h\
        messages/MOSDBoot.h\
+       messages/MOSDPGCreate.h\
        messages/MStatfsReply.h\
        messages/MAnchor.h\
        messages/MCacheExpire.h\

diff --git a/src/kernel/Makefile b/src/kernel/Makefile
index 5d7f2dd4fcd221da01febc385dfe492c73a0e892..3b84ed733f4121706412702f2bc88f19536fd119 100644 (file)
--- a/src/kernel/Makefile
+++ b/src/kernel/Makefile
@@ -18,10 +18,21 @@ else
 #Otherwise we were called directly from the command
 # line; invoke the kernel build system.
 
-       KERNELDIR ?= /lib/modules/$(shell uname -r)/build
-       PWD := $(shell pwd)
+KERNELDIR ?= /lib/modules/$(shell uname -r)/build
+PWD := $(shell pwd)
 
-default:
-       $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
+default: all
+
+all: ceph_fs.h 
+       $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_CEPH_FS=m modules
+
+modules_install:
+       $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_CEPH_FS=m modules_install
+
+clean:
+       $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+
+ceph_fs.h:
+       ln -s ../include/ceph_fs.h ceph_fs.h
 
 endif

diff --git a/src/kernel/README b/src/kernel/README
index 6ad79396ab0b9252ac6b568f588bf07f080ffe30..905558519de0cc1644c540b0e5bc7de9ec0157fe 100644 (file)
--- a/src/kernel/README
+++ b/src/kernel/README
@@ -1,5 +1,14 @@
 Quick and dirty instructions on building this into the kernel
 
+-- as a separate module
+
+$ make
+or
+$ make KERNELDIR=/path/to/kernel
+
+
+-- built in
+
 1) Patch kernel (to add to fs/Kconfig, fs/Makefile):
 
 $ cd linux
@@ -10,7 +19,7 @@ patching file fs/Makefile
 2) Symlink (adjust path to ceph source accordingly)
 
 $ ln -s ~/ceph/src/kernel fs/ceph
-$ ln -s ~/ceph/src/include/ceph_fs.h include/linux
+$ ln -s ~/ceph/src/include/ceph_fs.h fs/ceph
 
 3) Enable CONFIG_CEPH_FS in .config.  Ceph should now be the first item under File Systems -> Network File Systems.  
 

diff --git a/src/kernel/client.c b/src/kernel/client.c
index 7ca0f5cf10de22872d61f3aace292704e7dea533..4ed2afce93633fed6eb471f3f12c2d2a411a4b86 100644 (file)
--- a/src/kernel/client.c
+++ b/src/kernel/client.c
@@ -1,11 +1,12 @@
 
-#include <linux/ceph_fs.h>
 #include <linux/wait.h>
 #include <linux/sched.h>
 #include <linux/random.h>
 #include <linux/fs.h>
 #include <linux/mount.h>
 
+#include "ceph_fs.h"
+
 int ceph_debug_client = -1;
 #define DOUT_VAR ceph_debug_client
 #define DOUT_PREFIX "client: "

diff --git a/src/kernel/export.c b/src/kernel/export.c
index fc8abf6f632df4447329dae576c6b52e143ef4c0..f4e7dffc8300cea693979effd901d01cb9e07457 100644 (file)
--- a/src/kernel/export.c
+++ b/src/kernel/export.c
@@ -1,6 +1,7 @@
-#include <linux/ceph_fs.h>
 #include <linux/exportfs.h>
 
+#include "ceph_fs.h"
+
 int ceph_debug_export = -1;
 #define DOUT_VAR ceph_debug_export
 #define DOUT_PREFIX "export: "

diff --git a/src/kernel/inode.c b/src/kernel/inode.c
index f8f36bf0f290ae798748498b4930c40b5693cdf3..51ecc9631b1457e7d4738c49b2fc471c933e6b1f 100644 (file)
--- a/src/kernel/inode.c
+++ b/src/kernel/inode.c
@@ -5,10 +5,11 @@
 #include <linux/string.h>
 #include <linux/uaccess.h>
 #include <linux/kernel.h>
-#include <linux/ceph_fs.h>
 #include <linux/namei.h>
 #include <linux/writeback.h>
 
+#include "ceph_fs.h"
+
 int ceph_debug_inode = -1;
 #define DOUT_VAR ceph_debug_inode
 #define DOUT_PREFIX "inode: "

diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c
index 5c34b724b7eb6b279f89a153c961318a5bfbe429..0d86045e5d48318c13048e6e7f47708fa1af1443 100644 (file)
--- a/src/kernel/mds_client.c
+++ b/src/kernel/mds_client.c
@@ -1,10 +1,11 @@
 
-#include <linux/ceph_fs.h>
 #include <linux/wait.h>
 #include <linux/sched.h>
 #include "mds_client.h"
 #include "mon_client.h"
 
+#include "ceph_fs.h"
+
 int ceph_debug_mdsc = -1;
 #define DOUT_VAR ceph_debug_mdsc
 #define DOUT_PREFIX "mds: "

diff --git a/src/kernel/mdsmap.h b/src/kernel/mdsmap.h
index e41c7d68a90a791b3d2916f8c063baaae803a1a9..100f0c1e165d2a71e4ac7f9c1f8bd705926bf33d 100644 (file)
--- a/src/kernel/mdsmap.h
+++ b/src/kernel/mdsmap.h
@@ -1,7 +1,7 @@
 #ifndef _FS_CEPH_MDSMAP_H
 #define _FS_CEPH_MDSMAP_H
 
-#include <linux/ceph_fs.h>
+#include "ceph_fs.h"
 
 /*
  * mds map

diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c
index 23c817ff5bbafe8b66cd0d4b292bffd576ceeb01..ec1ba2dd28efa70b302216dba0dae91690b163c1 100644 (file)
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -3,8 +3,9 @@
 #include <linux/net.h>
 #include <linux/string.h>
 #include <linux/highmem.h>
-#include <linux/ceph_fs.h>
 #include <net/tcp.h>
+
+#include "ceph_fs.h"
 #include "messenger.h"
 #include "ktcp.h"
 

diff --git a/src/kernel/messenger.h b/src/kernel/messenger.h
index 47958f1a34df93644ca42c0c7ce25a14ee28e252..dc7acfe0de601e97aa08cc965f700f2a755a7a09 100644 (file)
--- a/src/kernel/messenger.h
+++ b/src/kernel/messenger.h
@@ -5,9 +5,10 @@
 #include <linux/net.h>
 #include <linux/radix-tree.h>
 #include <linux/workqueue.h>
-#include <linux/ceph_fs.h>
 #include <linux/version.h>
 
+#include "ceph_fs.h"
+
 struct ceph_msg;
 
 typedef void (*ceph_msgr_dispatch_t) (void *p, struct ceph_msg *m);

diff --git a/src/kernel/osd_client.h b/src/kernel/osd_client.h
index f88b8f0c43aed565ec6eefc18c3873b146b0317b..c120cf7fa87d045bbc3fcaf7e221d3a4089bc881 100644 (file)
--- a/src/kernel/osd_client.h
+++ b/src/kernel/osd_client.h
@@ -3,10 +3,10 @@
 
 /* this will be equivalent to osdc/Objecter.h */
 
-#include <linux/ceph_fs.h>
 #include <linux/radix-tree.h>
 #include <linux/completion.h>
 
+#include "ceph_fs.h"
 #include "osdmap.h"
 
 struct ceph_msg;

diff --git a/src/kernel/osdmap.h b/src/kernel/osdmap.h
index 2584c49e99aa1eda3ed7946bae38a77fa0975797..53a54ad8de61eea4b7f51c22656429bd35994dac 100644 (file)
--- a/src/kernel/osdmap.h
+++ b/src/kernel/osdmap.h
@@ -1,8 +1,7 @@
 #ifndef _FS_CEPH_OSDMAP_H
 #define _FS_CEPH_OSDMAP_H
 
-#include <linux/ceph_fs.h>
-
+#include "ceph_fs.h"
 #include "crush/crush.h"
 
 struct ceph_osdmap {

diff --git a/src/kernel/proc.c b/src/kernel/proc.c
index 038a798d403e6a640e517cbdb91f2e24806fb7ad..27f4a3a15d984d5e6ba35d8d8c177b20b6dc2945 100644 (file)
--- a/src/kernel/proc.c
+++ b/src/kernel/proc.c
@@ -1,8 +1,8 @@
-#include <linux/ceph_fs.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <asm/uaccess.h>
 
+#include "ceph_fs.h"
 #include "super.h"
 
 static int ceph_debug_level_read(char *page, char **start, off_t off,

diff --git a/src/kernel/super.h b/src/kernel/super.h
index 0ca03456817456ed4d0f5cc2354515eefa523e47..caaacb6076478391c7882fffaf2a59cbc162f49d 100644 (file)
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -1,13 +1,13 @@
 #ifndef _FS_CEPH_SUPER_H
 #define _FS_CEPH_SUPER_H
 
-#include <linux/ceph_fs.h>
 #include <linux/fs.h>
 #include <linux/wait.h>
 #include <linux/completion.h>
 #include <linux/pagemap.h>
 #include <linux/exportfs.h>
 
+#include "ceph_fs.h"
 #include "messenger.h"
 #include "mon_client.h"
 #include "mds_client.h"