diff options
| author | Jan Kara <jack@suse.cz> | 2010-08-24 14:28:03 +0200 |
|---|---|---|
| committer | Tao Ma <tao.ma@oracle.com> | 2010-09-08 14:25:57 +0800 |
| commit | 9b4c0ff32ccd87ab52d4c5bd0a0536febce11370 (patch) | |
| tree | b9e77d2798eac9051353b29f22e9315d9d9e13b5 /fs/ocfs2/alloc.c | |
| parent | b2b6ebf5f740e015b2155343958f067e594323ea (diff) | |
| download | blackbird-op-linux-9b4c0ff32ccd87ab52d4c5bd0a0536febce11370.tar.gz blackbird-op-linux-9b4c0ff32ccd87ab52d4c5bd0a0536febce11370.zip | |
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/alloc.c')
| -rw-r--r-- | fs/ocfs2/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index 215e12ce1d85..592fae5007d1 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -6672,7 +6672,7 @@ int ocfs2_grab_pages(struct inode *inode, loff_t start, loff_t end, last_page_bytes = PAGE_ALIGN(end); index = start >> PAGE_CACHE_SHIFT; do { - pages[numpages] = grab_cache_page(mapping, index); + pages[numpages] = find_or_create_page(mapping, index, GFP_NOFS); if (!pages[numpages]) { ret = -ENOMEM; mlog_errno(ret); |
