projects
/
linux-2.6-block.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_stable' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
fs
/
ext4
/
readpage.c
diff --git
a/fs/ext4/readpage.c
b/fs/ext4/readpage.c
index f24e7299e1c828834b89581c50fd7423710d2397..dc54a4b60eba0faf0b4f8afb290925b5b57e355a 100644
(file)
--- a/
fs/ext4/readpage.c
+++ b/
fs/ext4/readpage.c
@@
-279,7
+279,7
@@
int ext4_mpage_readpages(struct address_space *mapping,
if (ext4_encrypted_inode(inode) &&
S_ISREG(inode->i_mode)) {
if (ext4_encrypted_inode(inode) &&
S_ISREG(inode->i_mode)) {
- ctx = ext4_get_crypto_ctx(inode);
+ ctx = ext4_get_crypto_ctx(inode
, GFP_NOFS
);
if (IS_ERR(ctx))
goto set_error_page;
}
if (IS_ERR(ctx))
goto set_error_page;
}