projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
[cascardo/linux.git]
/
fs
/
cramfs
/
inode.c
diff --git
a/fs/cramfs/inode.c
b/fs/cramfs/inode.c
index
a275911
..
ddcfe59
100644
(file)
--- a/
fs/cramfs/inode.c
+++ b/
fs/cramfs/inode.c
@@
-195,8
+195,7
@@
static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned i
struct page *page = NULL;
if (blocknr + i < devsize) {
- page = read_mapping_page_async(mapping, blocknr + i,
- NULL);
+ page = read_mapping_page(mapping, blocknr + i, NULL);
/* synchronous error? */
if (IS_ERR(page))
page = NULL;