Commit 7adf5dfb authored Jan 25, 2011 by Josef Bacik Committed by Chris Mason Jan 28, 2011

Btrfs: handle no memory properly in prepare_pages



Instead of doing a BUG_ON(1) in prepare_pages if grab_cache_page() fails, just
loop through the pages we've already grabbed and unlock and release them, then
return -ENOMEM like we should.  Thanks,

Signed-off-by: Josef Bacik <josef@redhat.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>

parent ad0397a7

fs/btrfs/file.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -792,8 +792,12 @@ again:
		for (i = 0; i < num_pages; i++) {
		pages[i] = grab_cache_page(inode->i_mapping, index + i);
		if (!pages[i]) {
		err = -ENOMEM;
		BUG_ON(1);
		int c;
		for (c = i - 1; c >= 0; c--) {
		unlock_page(pages[c]);
		page_cache_release(pages[c]);
		}
		return -ENOMEM;
		}
		wait_on_page_writeback(pages[i]);
		}

Admin message