diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2009-12-23 08:05:15 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2009-12-23 08:05:15 -0500 |
commit | 3ebfdf885acedafcadceb4007e77438479094135 (patch) | |
tree | 1bd9a4b223aa22e201af9a87868a33ec53605daf /fs | |
parent | c8afb44682fcef6273e8b8eb19fab13ddd05b386 (diff) | |
download | op-kernel-dev-3ebfdf885acedafcadceb4007e77438479094135.zip op-kernel-dev-3ebfdf885acedafcadceb4007e77438479094135.tar.gz |
jbd2: don't use __GFP_NOFAIL in journal_init_common()
It triggers the warning in get_page_from_freelist(), and it isn't
appropriate to use __GFP_NOFAIL here anyway.
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14843
Reported-by: Christian Casteyde <casteyde.christian@free.fr>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/jbd2/journal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 17af879..ac0d027 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -814,7 +814,7 @@ static journal_t * journal_init_common (void) journal_t *journal; int err; - journal = kzalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL); + journal = kzalloc(sizeof(*journal), GFP_KERNEL); if (!journal) goto fail; |