From: Alexaner Zarochentsev <zam@namesys.com>

Use reiser4_gfp_mask_get for new reiser4 inode allocationr.  For deadlock
avaidance, it changes the memory allocation flags to GFP_NOFS if there is a
transaction open or any znode locks are held.

Signed-off-by: Alexander Zarochentsev <zam@namesys.com>
Cc: Hans Reiser <reiser@namesys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 fs/reiser4/super_ops.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN fs/reiser4/super_ops.c~reiser4-use-reiser4_gfp_mask_get-in-reiser4-inode-allocation fs/reiser4/super_ops.c
--- a/fs/reiser4/super_ops.c~reiser4-use-reiser4_gfp_mask_get-in-reiser4-inode-allocation
+++ a/fs/reiser4/super_ops.c
@@ -92,7 +92,7 @@ static struct inode *reiser4_alloc_inode
 	reiser4_inode_object *obj;
 
 	assert("nikita-1696", super != NULL);
-	obj = kmem_cache_alloc(inode_cache, SLAB_KERNEL);
+	obj = kmem_cache_alloc(inode_cache, reiser4_ctx_gfp_mask_get());
 	if (obj != NULL) {
 		reiser4_inode *info;
 
_