Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d20fbbe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://ceph.newdream.net/git/ceph-client 

* 'for-linus' of git://ceph.newdream.net/git/ceph-client:
  libceph: fix leak of osd structs during shutdown
  ceph: fix memory leak
  ceph: fix encoding of ino only (not relative) paths
  libceph: fix msgpool
parents 0ec26fd0 aca420bc

fs/ceph/mds_client.c

+1 −1
Original line number Diff line number Diff line
@@ -1595,7 +1595,7 @@ static int set_request_path_attr(struct inode *rinode, struct dentry *rdentry, 
		r = build_dentry_path(rdentry, ppath, pathlen, ino, freepath);

		dout(" dentry %p %llx/%.*s\n", rdentry, *ino, *pathlen,

		     *ppath);

	} else if (rpath) {

	} else if (rpath || rino) {

		*ino = rino;

		*ppath = rpath;

		*pathlen = strlen(rpath);

fs/ceph/super.c

+2 −2
Original line number Diff line number Diff line
@@ -813,8 +813,8 @@ static struct dentry *ceph_mount(struct file_system_type *fs_type, 
	fsc = create_fs_client(fsopt, opt);

	if (IS_ERR(fsc)) {

		res = ERR_CAST(fsc);

		kfree(fsopt);

		kfree(opt);

		destroy_mount_options(fsopt);

		ceph_destroy_options(opt);

		goto out_final;

	}

net/ceph/msgpool.c

+29 −11
Original line number Diff line number Diff line
@@ -7,27 +7,37 @@ 


#include <linux/ceph/msgpool.h>



static void *alloc_fn(gfp_t gfp_mask, void *arg)

static void *msgpool_alloc(gfp_t gfp_mask, void *arg)

{

	struct ceph_msgpool *pool = arg;

	void *p;

	struct ceph_msg *msg;



	p = ceph_msg_new(0, pool->front_len, gfp_mask);

	if (!p)

		pr_err("msgpool %s alloc failed\n", pool->name);

	return p;

	msg = ceph_msg_new(0, pool->front_len, gfp_mask);

	if (!msg) {

		dout("msgpool_alloc %s failed\n", pool->name);

	} else {

		dout("msgpool_alloc %s %p\n", pool->name, msg);

		msg->pool = pool;

	}

	return msg;

}



static void free_fn(void *element, void *arg)

static void msgpool_free(void *element, void *arg)

{

	ceph_msg_put(element);

	struct ceph_msgpool *pool = arg;

	struct ceph_msg *msg = element;



	dout("msgpool_release %s %p\n", pool->name, msg);

	msg->pool = NULL;

	ceph_msg_put(msg);

}



int ceph_msgpool_init(struct ceph_msgpool *pool,

		      int front_len, int size, bool blocking, const char *name)

{

	dout("msgpool %s init\n", name);

	pool->front_len = front_len;

	pool->pool = mempool_create(size, alloc_fn, free_fn, pool);

	pool->pool = mempool_create(size, msgpool_alloc, msgpool_free, pool);

	if (!pool->pool)

		return -ENOMEM;

	pool->name = name;
@@ -36,14 +46,17 @@ int ceph_msgpool_init(struct ceph_msgpool *pool, 


void ceph_msgpool_destroy(struct ceph_msgpool *pool)

{

	dout("msgpool %s destroy\n", pool->name);

	mempool_destroy(pool->pool);

}



struct ceph_msg *ceph_msgpool_get(struct ceph_msgpool *pool,

				  int front_len)

{

	struct ceph_msg *msg;



	if (front_len > pool->front_len) {

		pr_err("msgpool_get pool %s need front %d, pool size is %d\n",

		dout("msgpool_get %s need front %d, pool size is %d\n",

		       pool->name, front_len, pool->front_len);

		WARN_ON(1);
@@ -51,14 +64,19 @@ struct ceph_msg *ceph_msgpool_get(struct ceph_msgpool *pool, 
		return ceph_msg_new(0, front_len, GFP_NOFS);

	}



	return mempool_alloc(pool->pool, GFP_NOFS);

	msg = mempool_alloc(pool->pool, GFP_NOFS);

	dout("msgpool_get %s %p\n", pool->name, msg);

	return msg;

}



void ceph_msgpool_put(struct ceph_msgpool *pool, struct ceph_msg *msg)

{

	dout("msgpool_put %s %p\n", pool->name, msg);



	/* reset msg front_len; user may have changed it */

	msg->front.iov_len = pool->front_len;

	msg->hdr.front_len = cpu_to_le32(pool->front_len);



	kref_init(&msg->kref);  /* retake single ref */

	mempool_free(msg, pool->pool);

}

net/ceph/osd_client.c

+17 −5
Original line number Diff line number Diff line
@@ -685,6 +685,18 @@ static void __remove_osd(struct ceph_osd_client *osdc, struct ceph_osd *osd) 
	put_osd(osd);

}



static void remove_all_osds(struct ceph_osd_client *osdc)

{

	dout("__remove_old_osds %p\n", osdc);

	mutex_lock(&osdc->request_mutex);

	while (!RB_EMPTY_ROOT(&osdc->osds)) {

		struct ceph_osd *osd = rb_entry(rb_first(&osdc->osds),

						struct ceph_osd, o_node);

		__remove_osd(osdc, osd);

	}

	mutex_unlock(&osdc->request_mutex);

}



static void __move_osd_to_lru(struct ceph_osd_client *osdc,

			      struct ceph_osd *osd)

{
@@ -701,14 +713,14 @@ static void __remove_osd_from_lru(struct ceph_osd *osd) 
		list_del_init(&osd->o_osd_lru);

}



static void remove_old_osds(struct ceph_osd_client *osdc, int remove_all)

static void remove_old_osds(struct ceph_osd_client *osdc)

{

	struct ceph_osd *osd, *nosd;



	dout("__remove_old_osds %p\n", osdc);

	mutex_lock(&osdc->request_mutex);

	list_for_each_entry_safe(osd, nosd, &osdc->osd_lru, o_osd_lru) {

		if (!remove_all && time_before(jiffies, osd->lru_ttl))

		if (time_before(jiffies, osd->lru_ttl))

			break;

		__remove_osd(osdc, osd);

	}
@@ -751,6 +763,7 @@ static void __insert_osd(struct ceph_osd_client *osdc, struct ceph_osd *new) 
	struct rb_node *parent = NULL;

	struct ceph_osd *osd = NULL;



	dout("__insert_osd %p osd%d\n", new, new->o_osd);

	while (*p) {

		parent = *p;

		osd = rb_entry(parent, struct ceph_osd, o_node);
@@ -1144,7 +1157,7 @@ static void handle_osds_timeout(struct work_struct *work) 


	dout("osds timeout\n");

	down_read(&osdc->map_sem);

	remove_old_osds(osdc, 0);

	remove_old_osds(osdc);

	up_read(&osdc->map_sem);



	schedule_delayed_work(&osdc->osds_timeout_work,
@@ -1862,8 +1875,7 @@ void ceph_osdc_stop(struct ceph_osd_client *osdc) 
		ceph_osdmap_destroy(osdc->osdmap);

		osdc->osdmap = NULL;

	}

	remove_old_osds(osdc, 1);

	WARN_ON(!RB_EMPTY_ROOT(&osdc->osds));

	remove_all_osds(osdc);

	mempool_destroy(osdc->req_mempool);

	ceph_msgpool_destroy(&osdc->msgpool_op);

	ceph_msgpool_destroy(&osdc->msgpool_op_reply);