Commit 18bc0bbd authored by Evgeniy Polyakov's avatar Evgeniy Polyakov Committed by Greg Kroah-Hartman
Browse files

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: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c09ee9d2

drivers/staging/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -95,5 +95,7 @@ source "drivers/staging/android/Kconfig" 


source "drivers/staging/dst/Kconfig"



source "drivers/staging/pohmelfs/Kconfig"



endif # !STAGING_EXCLUDE_BUILD

endif # STAGING

drivers/staging/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -30,3 +30,4 @@ obj-$(CONFIG_TRANZPORT) += frontier/ 
obj-$(CONFIG_EPL)		+= epl/

obj-$(CONFIG_ANDROID)		+= android/

obj-$(CONFIG_DST)		+= dst/

obj-$(CONFIG_POHMELFS)		+= pohmelfs/

drivers/staging/pohmelfs/Kconfig

0 → 100644
+23 −0
Original line number Diff line number Diff line 
config POHMELFS

	tristate "POHMELFS filesystem support"

	select CONNECTOR

	help

	  POHMELFS stands for Parallel Optimized Host Message Exchange Layered File System.

	  This is a network filesystem which supports coherent caching of data and metadata

	  on clients.



config POHMELFS_DEBUG

	bool "POHMELFS debugging"

	depends on POHMELFS

	default n

	help

	  Turns on excessive POHMELFS debugging facilities.

	  You usually do not want to slow things down noticebly and get really lots of kernel

	  messages in syslog.



config POHMELFS_CRYPTO

	bool "POHMELFS crypto support"

	depends on CONFIG_CRYPTO_BLKCIPHER && CONFIG_CRYPTO_HASH

	help

	  This option allows to encrypt and/or protect with strong cryptographic hash all dataflow

	  between server and clients. Each config group can have own keys.

drivers/staging/pohmelfs/Makefile

0 → 100644
+3 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_POHMELFS)	+= pohmelfs.o



pohmelfs-y := inode.o config.o dir.o net.o path_entry.o trans.o crypto.o lock.o mcache.o

mm/filemap.c

+2 −0
Original line number Diff line number Diff line
@@ -513,6 +513,7 @@ int add_to_page_cache_lru(struct page *page, struct address_space *mapping, 
	}

	return ret;

}

EXPORT_SYMBOL_GPL(add_to_page_cache_lru);



#ifdef CONFIG_NUMA

struct page *__page_cache_alloc(gfp_t gfp)
@@ -645,6 +646,7 @@ int __lock_page_killable(struct page *page) 
	return __wait_on_bit_lock(page_waitqueue(page), &wait,

					sync_page_killable, TASK_KILLABLE);

}

EXPORT_SYMBOL_GPL(__lock_page_killable);



/**

 * __lock_page_nosync - get a lock on the page, without calling sync_page()