git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
[pandora-kernel.git]
/
fs
/
ceph
/
pagelist.c
diff --git
a/fs/ceph/pagelist.c
b/fs/ceph/pagelist.c
index
5f8dbf7
..
b6859f4
100644
(file)
--- a/
fs/ceph/pagelist.c
+++ b/
fs/ceph/pagelist.c
@@
-20,7
+20,7
@@
int ceph_pagelist_release(struct ceph_pagelist *pl)
static int ceph_pagelist_addpage(struct ceph_pagelist *pl)
{
- struct page *page =
alloc_page
(GFP_NOFS);
+ struct page *page =
__page_cache_alloc
(GFP_NOFS);
if (!page)
return -ENOMEM;
pl->room += PAGE_SIZE;