Commit 3bf53337 authored Apr 01, 2013 by Alex Elder Committed by Sage Weil May 01, 2013

ceph: set up page array mempool with correct size

In create_fs_client() a memory pool is set up be used for arrays of
pages that might be needed in ceph_writepages_start() if memory is
tight.  There are two problems with the way it's initialized:
    - The size provided is the number of pages we want in the
      array, but it should be the number of bytes required for
      that many page pointers.
    - The number of pages computed can end up being 0, while we
      will always need at least one page.

This patch fixes both of these problems.

This resolves the two simple problems defined in:
    http://tracker.ceph.com/issues/4603



Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

parent b0270324

fs/ceph/super.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -479,6 +479,8 @@ static struct ceph_fs_client create_fs_client(struct ceph_mount_options fsopt,
		CEPH_FEATURE_FLOCK \|
		CEPH_FEATURE_DIRLAYOUTHASH;
		const unsigned required_features = 0;
		int page_count;
		size_t size;
		int err = -ENOMEM;

		fsc = kzalloc(sizeof(*fsc), GFP_KERNEL);
		@@ -522,8 +524,9 @@ static struct ceph_fs_client create_fs_client(struct ceph_mount_options fsopt,

		/* set up mempools */
		err = -ENOMEM;
		fsc->wb_pagevec_pool = mempool_create_kmalloc_pool(10,
		fsc->mount_options->wsize >> PAGE_CACHE_SHIFT);
		page_count = fsc->mount_options->wsize >> PAGE_CACHE_SHIFT;
		size = sizeof (struct page ) (page_count ? page_count : 1);
		fsc->wb_pagevec_pool = mempool_create_kmalloc_pool(10, size);
		if (!fsc->wb_pagevec_pool)
		goto fail_trunc_wq;

Admin message