Commit 4156e735 authored Jun 01, 2009 by Felix Blyakher

xfs: prevent deadlock in xfs_qm_shake()



It's possible to recurse into filesystem from the memory
allocation, which deadlocks in xfs_qm_shake(). Add check
for __GFP_FS, and bail out if it is not set.

Signed-off-by: Felix Blyakher <felixb@sgi.com>
Signed-off-by: Hedi Berriche <hedi@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Felix Blyakher <felixb@sgi.com>

parent 09632487

fs/xfs/linux-2.6/kmem.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -103,7 +103,7 @@ extern void kmem_zone_zalloc(kmem_zone_t , unsigned int __nocast);
	static inline int		static inline int
	kmem_shake_allow(gfp_t gfp_mask)		kmem_shake_allow(gfp_t gfp_mask)
	{		{
	return (gfp_mask & __GFP_WAIT) != 0;		return ((gfp_mask & __GFP_WAIT) && (gfp_mask & __GFP_FS));
	}		}

	#endif /* __XFS_SUPPORT_KMEM_H__ */		#endif /* __XFS_SUPPORT_KMEM_H__ */