From patchwork Wed Dec  8 09:09:27 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jeff Wu <cpwu@tnsoft.com.cn>
X-Patchwork-Id: 390202
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB898lbq031541
	for <patchwork-ceph-devel@patchwork.kernel.org>;
	Wed, 8 Dec 2010 09:08:48 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752811Ab0LHJIq (ORCPT
	<rfc822;patchwork-ceph-devel@patchwork.kernel.org>);
	Wed, 8 Dec 2010 04:08:46 -0500
Received: from [210.22.136.227] ([210.22.136.227]:32258 "EHLO
	MAIL.TNSOFT.COM.CN" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org
	with ESMTP id S1752639Ab0LHJIo (ORCPT
	<rfc822; ceph-devel@vger.kernel.org>); Wed, 8 Dec 2010 04:08:44 -0500
Received: from [172.16.10.63] (172.16.10.63) by MAIL.tnsoft.com.cn
	(172.16.1.2) with Microsoft SMTP Server id 8.3.106.1; Wed, 8 Dec 2010
	17:05:13 +0800
Subject: [PATCH ceph-client-standalone :master-backport ] miss Makefile
From: Jeff Wu <cpwu@tnsoft.com.cn>
Reply-To: <cpwu@tnsoft.com.cn>
To: Sage Weil <sage@newdream.net>, Gregory Farnum <gregf@hq.newdream.net>,
	yehuda <yehuda@hq.newdream.net>
CC: ceph-devel <ceph-devel@vger.kernel.org>
Organization: Jeff Wu
Date: Wed, 8 Dec 2010 17:09:27 +0800
Message-ID: <1291799367.1958.33.camel@cephhost>
MIME-Version: 1.0
X-Mailer: Evolution 2.30.3 
Sender: ceph-devel-owner@vger.kernel.org
Precedence: bulk
List-ID: <ceph-devel.vger.kernel.org>
X-Mailing-List: ceph-devel@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Wed, 08 Dec 2010 09:08:49 +0000 (UTC)


==========================================================================

diff --git a/ceph-client-standalone/Makefile
b/ceph-client-standalone/Makefile
new file mode 100644
index 0000000..1b26d4b
--- /dev/null
+++ b/ceph-client-standalone/Makefile
@@ -0,0 +1,47 @@
+#
+# Makefile for CEPH filesystem.
+#
+
+ifneq ($(KERNELRELEASE),) 
+
+obj-$(CONFIG_CEPH_FS) += ceph.o
+
+ceph-objs := ceph/super.o ceph/inode.o ceph/dir.o ceph/file.o
ceph/locks.o ceph/addr.o ceph/ioctl.o \
+	ceph/export.o ceph/caps.o ceph/snap.o ceph/xattr.o \
+	ceph/mds_client.o ceph/mdsmap.o ceph/strings.o ceph/ceph_frag.o \
+	ceph/debugfs.o  \
+	libceph/ceph_common.o libceph/messenger.o libceph/msgpool.o
libceph/buffer.o libceph/pagelist.o \
+	libceph/mon_client.o \
+	libceph/osd_client.o libceph/osdmap.o libceph/crush/crush.o
libceph/crush/mapper.o libceph/crush/hash.o \
+	libceph/debugfs.o \
+	libceph/auth.o libceph/auth_none.o \
+	libceph/crypto.o libceph/armor.o \
+	libceph/auth_x.o \
+	libceph/ceph_fs.o libceph/ceph_strings.o libceph/ceph_hash.o \
+	libceph/pagevec.o
+
+clean-files += Modules_symvers
+clean-files += Module_symvers
+
+#EXTRA_CFLAGS += 
+
+else
+# Otherwise we were called directly from the command
+# line; invoke the kernel build system.
+
+KERNELRELEASE ?= $(shell uname -r)
+KERNELDIR ?= /lib/modules/$(KERNELRELEASE)/build
+PWD := $(shell pwd)
+
+
+default: all
+
+all:
+	$(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
+
+endif
diff --git a/ceph-std/libceph/ceph_common.c
b/ceph-client-standalone/libceph/ceph_common.c
index fc759f8..58feda5 100644
--- a/ceph-std/libceph/ceph_common.c
+++ b/ceph-client-standalone/libceph/ceph_common.c
@@ -487,6 +487,8 @@ int ceph_open_session(struct ceph_client *client)
 EXPORT_SYMBOL(ceph_open_session);
 
 
+#ifdef CONFIG_CEPH_LIB
+
 static int __init init_ceph_lib(void)
 {
 	int ret = 0;
@@ -522,6 +524,8 @@ static void __exit exit_ceph_lib(void)
 module_init(init_ceph_lib);
 module_exit(exit_ceph_lib);
 
+#endif 
+
 MODULE_AUTHOR("Sage Weil <sage@newdream.net>");
 MODULE_AUTHOR("Yehuda Sadeh <yehuda@hq.newdream.net>");
 MODULE_AUTHOR("Patience Warnick <patience@newdream.net>");