diff options
author | Evgeniy Polyakov <zbr@ioremap.net> | 2009-02-09 09:02:42 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 17:53:36 -0400 |
commit | 18bc0bbd162e3eb3e7ea2953c315ad4113a57164 (patch) | |
tree | 6c46e99774772b8ac0ef92633377f4328bd87dbf | |
parent | c09ee9d206994655d55de60222a3024702ad2055 (diff) |
Staging: pohmelfs: kconfig/makefile and vfs changes.
This patch adds Kconfig and Makefile entries and exports to
VFS functions to be used by POHMELFS.
Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/pohmelfs/Kconfig | 23 | ||||
-rw-r--r-- | drivers/staging/pohmelfs/Makefile | 3 | ||||
-rw-r--r-- | mm/filemap.c | 2 |
5 files changed, 31 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index e319c67c5964..f62c2d125b69 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig | |||
@@ -95,5 +95,7 @@ source "drivers/staging/android/Kconfig" | |||
95 | 95 | ||
96 | source "drivers/staging/dst/Kconfig" | 96 | source "drivers/staging/dst/Kconfig" |
97 | 97 | ||
98 | source "drivers/staging/pohmelfs/Kconfig" | ||
99 | |||
98 | endif # !STAGING_EXCLUDE_BUILD | 100 | endif # !STAGING_EXCLUDE_BUILD |
99 | endif # STAGING | 101 | endif # STAGING |
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 1971299a82fd..16a8d703319f 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile | |||
@@ -30,3 +30,4 @@ obj-$(CONFIG_TRANZPORT) += frontier/ | |||
30 | obj-$(CONFIG_EPL) += epl/ | 30 | obj-$(CONFIG_EPL) += epl/ |
31 | obj-$(CONFIG_ANDROID) += android/ | 31 | obj-$(CONFIG_ANDROID) += android/ |
32 | obj-$(CONFIG_DST) += dst/ | 32 | obj-$(CONFIG_DST) += dst/ |
33 | obj-$(CONFIG_POHMELFS) += pohmelfs/ | ||
diff --git a/drivers/staging/pohmelfs/Kconfig b/drivers/staging/pohmelfs/Kconfig new file mode 100644 index 000000000000..82d13ad67c86 --- /dev/null +++ b/drivers/staging/pohmelfs/Kconfig | |||
@@ -0,0 +1,23 @@ | |||
1 | config POHMELFS | ||
2 | tristate "POHMELFS filesystem support" | ||
3 | select CONNECTOR | ||
4 | help | ||
5 | POHMELFS stands for Parallel Optimized Host Message Exchange Layered File System. | ||
6 | This is a network filesystem which supports coherent caching of data and metadata | ||
7 | on clients. | ||
8 | |||
9 | config POHMELFS_DEBUG | ||
10 | bool "POHMELFS debugging" | ||
11 | depends on POHMELFS | ||
12 | default n | ||
13 | help | ||
14 | Turns on excessive POHMELFS debugging facilities. | ||
15 | You usually do not want to slow things down noticebly and get really lots of kernel | ||
16 | messages in syslog. | ||
17 | |||
18 | config POHMELFS_CRYPTO | ||
19 | bool "POHMELFS crypto support" | ||
20 | depends on CONFIG_CRYPTO_BLKCIPHER && CONFIG_CRYPTO_HASH | ||
21 | help | ||
22 | This option allows to encrypt and/or protect with strong cryptographic hash all dataflow | ||
23 | between server and clients. Each config group can have own keys. | ||
diff --git a/drivers/staging/pohmelfs/Makefile b/drivers/staging/pohmelfs/Makefile new file mode 100644 index 000000000000..196561ca26bc --- /dev/null +++ b/drivers/staging/pohmelfs/Makefile | |||
@@ -0,0 +1,3 @@ | |||
1 | obj-$(CONFIG_POHMELFS) += pohmelfs.o | ||
2 | |||
3 | pohmelfs-y := inode.o config.o dir.o net.o path_entry.o trans.o crypto.o lock.o mcache.o | ||
diff --git a/mm/filemap.c b/mm/filemap.c index fc11974f2bee..2e2d38ebda4b 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -513,6 +513,7 @@ int add_to_page_cache_lru(struct page *page, struct address_space *mapping, | |||
513 | } | 513 | } |
514 | return ret; | 514 | return ret; |
515 | } | 515 | } |
516 | EXPORT_SYMBOL_GPL(add_to_page_cache_lru); | ||
516 | 517 | ||
517 | #ifdef CONFIG_NUMA | 518 | #ifdef CONFIG_NUMA |
518 | struct page *__page_cache_alloc(gfp_t gfp) | 519 | struct page *__page_cache_alloc(gfp_t gfp) |
@@ -645,6 +646,7 @@ int __lock_page_killable(struct page *page) | |||
645 | return __wait_on_bit_lock(page_waitqueue(page), &wait, | 646 | return __wait_on_bit_lock(page_waitqueue(page), &wait, |
646 | sync_page_killable, TASK_KILLABLE); | 647 | sync_page_killable, TASK_KILLABLE); |
647 | } | 648 | } |
649 | EXPORT_SYMBOL_GPL(__lock_page_killable); | ||
648 | 650 | ||
649 | /** | 651 | /** |
650 | * __lock_page_nosync - get a lock on the page, without calling sync_page() | 652 | * __lock_page_nosync - get a lock on the page, without calling sync_page() |