The patch titled Reiser4: use reiser4_gfp_mask_get in reiser4 inode allocation. has been added to the -mm tree. Its filename is reiser4-use-reiser4_gfp_mask_get-in-reiser4-inode-allocation.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: Reiser4: use reiser4_gfp_mask_get in reiser4 inode allocation. From: Alexaner Zarochentsev <zam@xxxxxxxxxxx> 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@xxxxxxxxxxx> Cc: Hans Reiser <reiser@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- 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; _ Patches currently in -mm which might be from zam@xxxxxxxxxxx are reiser4-decribe-new-atom-locking-and-nested-atom-locks-to-lock-validator.patch reiser4-use-generic-file-read.patch reiser4-simplify-reading-of-partially-converted-files.patch reiser4-use-page_offset.patch reiser4-use-reiser4_gfp_mask_get-in-reiser4-inode-allocation.patch reiser4-re-add-page_count-check-to-reiser4_releasepage.patch reiser4-restore-fibmap-ioctl-support-for-packed-files.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html