Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
fs
/
ramfs
/
file-nommu.c
diff --git
a/kernel/fs/ramfs/file-nommu.c
b/kernel/fs/ramfs/file-nommu.c
index
ba1323a
..
a586467
100644
(file)
--- a/
kernel/fs/ramfs/file-nommu.c
+++ b/
kernel/fs/ramfs/file-nommu.c
@@
-70,6
+70,7
@@
int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize)
unsigned order;
void *data;
int ret;
unsigned order;
void *data;
int ret;
+ gfp_t gfp = mapping_gfp_mask(inode->i_mapping);
/* make various checks */
order = get_order(newsize);
/* make various checks */
order = get_order(newsize);
@@
-84,7
+85,7
@@
int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize)
/* allocate enough contiguous pages to be able to satisfy the
* request */
/* allocate enough contiguous pages to be able to satisfy the
* request */
- pages = alloc_pages(
mapping_gfp_mask(inode->i_mapping)
, order);
+ pages = alloc_pages(
gfp
, order);
if (!pages)
return -ENOMEM;
if (!pages)
return -ENOMEM;
@@
-108,7
+109,7
@@
int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize)
struct page *page = pages + loop;
ret = add_to_page_cache_lru(page, inode->i_mapping, loop,
struct page *page = pages + loop;
ret = add_to_page_cache_lru(page, inode->i_mapping, loop,
-
GFP_KERNEL
);
+
gfp
);
if (ret < 0)
goto add_error;
if (ret < 0)
goto add_error;