projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubi
[firefly-linux-kernel-4.4.55.git]
/
fs
/
gfs2
/
dir.c
diff --git
a/fs/gfs2/dir.c
b/fs/gfs2/dir.c
index 0cb4c1557f20c87a44f74b4ac7d29f9a700de05a..2e5fc268d3242678c8a8e348141679a8fc94b530 100644
(file)
--- a/
fs/gfs2/dir.c
+++ b/
fs/gfs2/dir.c
@@
-1859,7
+1859,7
@@
static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
memset(&rlist, 0, sizeof(struct gfs2_rgrp_list));
- ht = kzalloc(size, GFP_NOFS);
+ ht = kzalloc(size, GFP_NOFS
| __GFP_NOWARN
);
if (ht == NULL)
ht = vzalloc(size);
if (!ht)