diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 08:22:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 08:22:34 -0700 |
| commit | fdc0ad80a4f27efcb457b49f5dd8455a3d623559 (patch) | |
| tree | 189cde09de3a52aece0493385921b4dd7e096ed2 /fs/ubifs/orphan.c | |
| parent | dc87c55120b0a5b0c4d731183f8bb348981aba65 (diff) | |
| parent | 6ed09c34b7984a978a73a855f4c2e6662acc8bdb (diff) | |
Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6
* 'for-linus' of git://git.infradead.org/ubi-2.6:
UBIFS: fix assertion warning and refine comments
UBIFS: kill CONFIG_UBIFS_FS_DEBUG_CHKS
UBIFS: use GFP_NOFS properly
UBI: use GFP_NOFS properly
Diffstat (limited to 'fs/ubifs/orphan.c')
| -rw-r--r-- | fs/ubifs/orphan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c index 2cdbd31641d7..09df318e368f 100644 --- a/fs/ubifs/orphan.c +++ b/fs/ubifs/orphan.c @@ -898,7 +898,7 @@ static int dbg_scan_orphans(struct ubifs_info *c, struct check_info *ci) if (c->no_orphs) return 0; - buf = __vmalloc(c->leb_size, GFP_KERNEL | GFP_NOFS, PAGE_KERNEL); + buf = __vmalloc(c->leb_size, GFP_NOFS, PAGE_KERNEL); if (!buf) { ubifs_err("cannot allocate memory to check orphans"); return 0; |