Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux.git] / net / 9p / util.c

diff --git a/net/9p/util.c b/net/9p/util.c
index e048701a72d230821f6e23eeddd89f5a14fc2f9b..b84619b5ba221e4576b2e8ad99256bb4f91f47cb 100644 (file)
--- a/net/9p/util.c
+++ b/net/9p/util.c
@@ -92,7 +92,7 @@ int p9_idpool_get(struct p9_idpool *p)
        unsigned long flags;
 
 retry:
-       if (idr_pre_get(&p->pool, GFP_KERNEL) == 0)
+       if (idr_pre_get(&p->pool, GFP_NOFS) == 0)
                return 0;
 
        spin_lock_irqsave(&p->lock, flags);