diff options
| -rw-r--r-- | include/linux/ceph/pagelist.h | 12 | ||||
| -rw-r--r-- | net/ceph/pagelist.c | 38 | 
2 files changed, 0 insertions, 50 deletions
| diff --git a/include/linux/ceph/pagelist.h b/include/linux/ceph/pagelist.h index 5dead8486fd8..879bec0863aa 100644 --- a/include/linux/ceph/pagelist.h +++ b/include/linux/ceph/pagelist.h @@ -17,12 +17,6 @@ struct ceph_pagelist {  	refcount_t refcnt;  }; -struct ceph_pagelist_cursor { -	struct ceph_pagelist *pl;   /* pagelist, for error checking */ -	struct list_head *page_lru; /* page in list */ -	size_t room;		    /* room remaining to reset to */ -}; -  struct ceph_pagelist *ceph_pagelist_alloc(gfp_t gfp_flags);  extern void ceph_pagelist_release(struct ceph_pagelist *pl); @@ -33,12 +27,6 @@ extern int ceph_pagelist_reserve(struct ceph_pagelist *pl, size_t space);  extern int ceph_pagelist_free_reserve(struct ceph_pagelist *pl); -extern void ceph_pagelist_set_cursor(struct ceph_pagelist *pl, -				     struct ceph_pagelist_cursor *c); - -extern int ceph_pagelist_truncate(struct ceph_pagelist *pl, -				  struct ceph_pagelist_cursor *c); -  static inline int ceph_pagelist_encode_64(struct ceph_pagelist *pl, u64 v)  {  	__le64 ev = cpu_to_le64(v); diff --git a/net/ceph/pagelist.c b/net/ceph/pagelist.c index 74622b278d57..5a9c4be5f222 100644 --- a/net/ceph/pagelist.c +++ b/net/ceph/pagelist.c @@ -131,41 +131,3 @@ int ceph_pagelist_free_reserve(struct ceph_pagelist *pl)  	return 0;  }  EXPORT_SYMBOL(ceph_pagelist_free_reserve); - -/* Create a truncation point. */ -void ceph_pagelist_set_cursor(struct ceph_pagelist *pl, -			      struct ceph_pagelist_cursor *c) -{ -	c->pl = pl; -	c->page_lru = pl->head.prev; -	c->room = pl->room; -} -EXPORT_SYMBOL(ceph_pagelist_set_cursor); - -/* Truncate a pagelist to the given point. Move extra pages to reserve. - * This won't sleep. - * Returns: 0 on success, - *          -EINVAL if the pagelist doesn't match the trunc point pagelist - */ -int ceph_pagelist_truncate(struct ceph_pagelist *pl, -			   struct ceph_pagelist_cursor *c) -{ -	struct page *page; - -	if (pl != c->pl) -		return -EINVAL; -	ceph_pagelist_unmap_tail(pl); -	while (pl->head.prev != c->page_lru) { -		page = list_entry(pl->head.prev, struct page, lru); -		/* move from pagelist to reserve */ -		list_move_tail(&page->lru, &pl->free_list); -		++pl->num_pages_free; -	} -	pl->room = c->room; -	if (!list_empty(&pl->head)) { -		page = list_entry(pl->head.prev, struct page, lru); -		pl->mapped_tail = kmap(page); -	} -	return 0; -} -EXPORT_SYMBOL(ceph_pagelist_truncate); | 
