Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932095AbZIVRlh (ORCPT ); Tue, 22 Sep 2009 13:41:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756560AbZIVRld (ORCPT ); Tue, 22 Sep 2009 13:41:33 -0400 Received: from cobra.newdream.net ([66.33.216.30]:41688 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756317AbZIVRlK (ORCPT ); Tue, 22 Sep 2009 13:41:10 -0400 From: Sage Weil To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org Cc: yehuda@newdream.net, Sage Weil Subject: [PATCH 21/21] ceph: Kconfig, Makefile Date: Tue, 22 Sep 2009 10:38:49 -0700 Message-Id: <1253641129-28434-22-git-send-email-sage@newdream.net> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1253641129-28434-21-git-send-email-sage@newdream.net> References: <1253641129-28434-1-git-send-email-sage@newdream.net> <1253641129-28434-2-git-send-email-sage@newdream.net> <1253641129-28434-3-git-send-email-sage@newdream.net> <1253641129-28434-4-git-send-email-sage@newdream.net> <1253641129-28434-5-git-send-email-sage@newdream.net> <1253641129-28434-6-git-send-email-sage@newdream.net> <1253641129-28434-7-git-send-email-sage@newdream.net> <1253641129-28434-8-git-send-email-sage@newdream.net> <1253641129-28434-9-git-send-email-sage@newdream.net> <1253641129-28434-10-git-send-email-sage@newdream.net> <1253641129-28434-11-git-send-email-sage@newdream.net> <1253641129-28434-12-git-send-email-sage@newdream.net> <1253641129-28434-13-git-send-email-sage@newdream.net> <1253641129-28434-14-git-send-email-sage@newdream.net> <1253641129-28434-15-git-send-email-sage@newdream.net> <1253641129-28434-16-git-send-email-sage@newdream.net> <1253641129-28434-17-git-send-email-sage@newdream.net> <1253641129-28434-18-git-send-email-sage@newdream.net> <1253641129-28434-19-git-send-email-sage@newdream.net> <1253641129-28434-20-git-send-email-sage@newdream.net> <1253641129-28434-21-git-send-email-sage@newdream.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3092 Lines: 114 Kconfig options and Makefile. Signed-off-by: Sage Weil --- fs/Kconfig | 1 + fs/Makefile | 1 + fs/ceph/Kconfig | 26 ++++++++++++++++++++++++++ fs/ceph/Makefile | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 0 deletions(-) create mode 100644 fs/ceph/Kconfig create mode 100644 fs/ceph/Makefile diff --git a/fs/Kconfig b/fs/Kconfig index 0e7da7b..fe7341c 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -233,6 +233,7 @@ config NFS_COMMON source "net/sunrpc/Kconfig" source "fs/smbfs/Kconfig" +source "fs/ceph/Kconfig" source "fs/cifs/Kconfig" source "fs/ncpfs/Kconfig" source "fs/coda/Kconfig" diff --git a/fs/Makefile b/fs/Makefile index af6d047..5ef73a0 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -124,3 +124,4 @@ obj-$(CONFIG_OCFS2_FS) += ocfs2/ obj-$(CONFIG_BTRFS_FS) += btrfs/ obj-$(CONFIG_GFS2_FS) += gfs2/ obj-$(CONFIG_EXOFS_FS) += exofs/ +obj-$(CONFIG_CEPH_FS) += ceph/ diff --git a/fs/ceph/Kconfig b/fs/ceph/Kconfig new file mode 100644 index 0000000..bc1fbd9 --- /dev/null +++ b/fs/ceph/Kconfig @@ -0,0 +1,26 @@ +config CEPH_FS + tristate "Ceph distributed file system (EXPERIMENTAL)" + depends on INET && EXPERIMENTAL + select LIBCRC32C + help + Choose Y or M here to include support for mounting the + experimental Ceph distributed file system. Ceph is an extremely + scalable file system designed to provide high performance, + reliable access to petabytes of storage. + + More information at http://ceph.newdream.net/. + + If unsure, say N. + +config CEPH_FS_PRETTYDEBUG + bool "Include file:line in ceph debug output" + depends on CEPH_FS + default n + help + If you say Y here, debug output will include a filename and + line to aid debugging. This icnreases kernel size and slows + execution slightly when debug call sites are enabled (e.g., + via CONFIG_DYNAMIC_DEBUG). + + If unsure, say N. + diff --git a/fs/ceph/Makefile b/fs/ceph/Makefile new file mode 100644 index 0000000..031b85f --- /dev/null +++ b/fs/ceph/Makefile @@ -0,0 +1,35 @@ +# +# Makefile for CEPH filesystem. +# + +ifneq ($(KERNELRELEASE),) + +obj-$(CONFIG_CEPH_FS) += ceph.o + +ceph-objs := super.o inode.o dir.o file.o addr.o ioctl.o \ + export.o caps.o snap.o \ + messenger.o msgpool.o \ + mds_client.o mdsmap.o \ + mon_client.o \ + osd_client.o osdmap.o crush/crush.o crush/mapper.o \ + debugfs.o + +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) + +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 -- 1.5.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/