diff options
author | Jan Kara <jack@suse.cz> | 2010-08-24 08:28:03 -0400 |
---|---|---|
committer | Tao Ma <tao.ma@oracle.com> | 2010-09-08 02:25:57 -0400 |
commit | 9b4c0ff32ccd87ab52d4c5bd0a0536febce11370 (patch) | |
tree | b9e77d2798eac9051353b29f22e9315d9d9e13b5 /fs/ocfs2/file.c | |
parent | b2b6ebf5f740e015b2155343958f067e594323ea (diff) |
ocfs2: Fix deadlock when allocating page
We cannot call grab_cache_page() when holding filesystem locks or with
a transaction started as grab_cache_page() calls page allocation with
GFP_KERNEL flag and thus page reclaim can recurse back into the filesystem
causing deadlocks or various assertion failures. We have to use
find_or_create_page() instead and pass it GFP_NOFS as we do with other
allocations.
Acked-by: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Tao Ma <tao.ma@oracle.com>
Diffstat (limited to 'fs/ocfs2/file.c')
-rw-r--r-- | fs/ocfs2/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 6b2be0f2eacd..2caa3a7a1a39 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -783,7 +783,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from, | |||
783 | BUG_ON(abs_to > (((u64)index + 1) << PAGE_CACHE_SHIFT)); | 783 | BUG_ON(abs_to > (((u64)index + 1) << PAGE_CACHE_SHIFT)); |
784 | BUG_ON(abs_from & (inode->i_blkbits - 1)); | 784 | BUG_ON(abs_from & (inode->i_blkbits - 1)); |
785 | 785 | ||
786 | page = grab_cache_page(mapping, index); | 786 | page = find_or_create_page(mapping, index, GFP_NOFS); |
787 | if (!page) { | 787 | if (!page) { |
788 | ret = -ENOMEM; | 788 | ret = -ENOMEM; |
789 | mlog_errno(ret); | 789 | mlog_errno(ret); |