diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /net/9p/util.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'net/9p/util.c')
| -rw-r--r-- | net/9p/util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/9p/util.c b/net/9p/util.c index e048701a72d2..9c1c9348ac35 100644 --- a/net/9p/util.c +++ b/net/9p/util.c | |||
| @@ -67,7 +67,7 @@ EXPORT_SYMBOL(p9_idpool_create); | |||
| 67 | 67 | ||
| 68 | /** | 68 | /** |
| 69 | * p9_idpool_destroy - create a new per-connection id pool | 69 | * p9_idpool_destroy - create a new per-connection id pool |
| 70 | * @p: idpool to destory | 70 | * @p: idpool to destroy |
| 71 | */ | 71 | */ |
| 72 | 72 | ||
| 73 | void p9_idpool_destroy(struct p9_idpool *p) | 73 | void p9_idpool_destroy(struct p9_idpool *p) |
| @@ -92,8 +92,8 @@ int p9_idpool_get(struct p9_idpool *p) | |||
| 92 | unsigned long flags; | 92 | unsigned long flags; |
| 93 | 93 | ||
| 94 | retry: | 94 | retry: |
| 95 | if (idr_pre_get(&p->pool, GFP_KERNEL) == 0) | 95 | if (idr_pre_get(&p->pool, GFP_NOFS) == 0) |
| 96 | return 0; | 96 | return -1; |
| 97 | 97 | ||
| 98 | spin_lock_irqsave(&p->lock, flags); | 98 | spin_lock_irqsave(&p->lock, flags); |
| 99 | 99 | ||