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

Commit 41c88bd7 authored by Li Hong's avatar Li Hong Committed by Ryusuke Konishi
Browse files

nilfs2: cleanup multi kmem_cache_{create,destroy} code 



This cleanup patch gives several improvements:

 - Moving all kmem_cache_{create_destroy} calls into one place, which removes
 some small function calls, cleans up error check code and clarify the logic.

 - Mark all initial code in __init section.

 - Remove some very obvious comments.

 - Adjust some declarations.

 - Fix some space-tab issues.

Signed-off-by: default avatarLi Hong <lihong.hi@gmail.com>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent aaed1d5b

fs/nilfs2/btree.c

+0 −40
Original line number Diff line number Diff line
@@ -31,46 +31,6 @@ 
#include "alloc.h"

#include "dat.h"



/**

 * struct nilfs_btree_path - A path on which B-tree operations are executed

 * @bp_bh: buffer head of node block

 * @bp_sib_bh: buffer head of sibling node block

 * @bp_index: index of child node

 * @bp_oldreq: ptr end request for old ptr

 * @bp_newreq: ptr alloc request for new ptr

 * @bp_op: rebalance operation

 */

struct nilfs_btree_path {

	struct buffer_head *bp_bh;

	struct buffer_head *bp_sib_bh;

	int bp_index;

	union nilfs_bmap_ptr_req bp_oldreq;

	union nilfs_bmap_ptr_req bp_newreq;

	struct nilfs_btnode_chkey_ctxt bp_ctxt;

	void (*bp_op)(struct nilfs_btree *, struct nilfs_btree_path *,

		      int, __u64 *, __u64 *);

};



/*

 * B-tree path operations

 */



static struct kmem_cache *nilfs_btree_path_cache;



int __init nilfs_btree_path_cache_init(void)

{

	nilfs_btree_path_cache =

		kmem_cache_create("nilfs2_btree_path_cache",

				  sizeof(struct nilfs_btree_path) *

				  NILFS_BTREE_LEVEL_MAX, 0, 0, NULL);

	return (nilfs_btree_path_cache != NULL) ? 0 : -ENOMEM;

}



void nilfs_btree_path_cache_destroy(void)

{

	kmem_cache_destroy(nilfs_btree_path_cache);

}



static struct nilfs_btree_path *nilfs_btree_alloc_path(void)

{

	struct nilfs_btree_path *path;

fs/nilfs2/btree.h

+20 −3
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ 
#include "btnode.h"

#include "bmap.h"



struct nilfs_btree;

struct nilfs_btree_path;



/**

 * struct nilfs_btree - B-tree structure

 * @bt_bmap: bmap base structure
@@ -41,6 +38,25 @@ struct nilfs_btree { 
	struct nilfs_bmap bt_bmap;

};



/**

 * struct nilfs_btree_path - A path on which B-tree operations are executed

 * @bp_bh: buffer head of node block

 * @bp_sib_bh: buffer head of sibling node block

 * @bp_index: index of child node

 * @bp_oldreq: ptr end request for old ptr

 * @bp_newreq: ptr alloc request for new ptr

 * @bp_op: rebalance operation

 */

struct nilfs_btree_path {

	struct buffer_head *bp_bh;

	struct buffer_head *bp_sib_bh;

	int bp_index;

	union nilfs_bmap_ptr_req bp_oldreq;

	union nilfs_bmap_ptr_req bp_newreq;

	struct nilfs_btnode_chkey_ctxt bp_ctxt;

	void (*bp_op)(struct nilfs_btree *, struct nilfs_btree_path *,

		      int, __u64 *, __u64 *);

};



#define NILFS_BTREE_ROOT_SIZE		NILFS_BMAP_SIZE

#define NILFS_BTREE_ROOT_NCHILDREN_MAX					\
@@ -57,6 +73,7 @@ struct nilfs_btree { 
#define NILFS_BTREE_KEY_MIN	((__u64)0)

#define NILFS_BTREE_KEY_MAX	(~(__u64)0)



extern struct kmem_cache *nilfs_btree_path_cache;



int nilfs_btree_path_cache_init(void);

void nilfs_btree_path_cache_destroy(void);

fs/nilfs2/segbuf.c

+0 −25
Original line number Diff line number Diff line
@@ -40,35 +40,10 @@ struct nilfs_write_info { 
	sector_t		blocknr;

};





static int nilfs_segbuf_write(struct nilfs_segment_buffer *segbuf,

			      struct the_nilfs *nilfs);

static int nilfs_segbuf_wait(struct nilfs_segment_buffer *segbuf);





static struct kmem_cache *nilfs_segbuf_cachep;



static void nilfs_segbuf_init_once(void *obj)

{

	memset(obj, 0, sizeof(struct nilfs_segment_buffer));

}



int __init nilfs_init_segbuf_cache(void)

{

	nilfs_segbuf_cachep =

		kmem_cache_create("nilfs2_segbuf_cache",

				  sizeof(struct nilfs_segment_buffer),

				  0, SLAB_RECLAIM_ACCOUNT,

				  nilfs_segbuf_init_once);



	return (nilfs_segbuf_cachep == NULL) ? -ENOMEM : 0;

}



void nilfs_destroy_segbuf_cache(void)

{

	kmem_cache_destroy(nilfs_segbuf_cachep);

}



struct nilfs_segment_buffer *nilfs_segbuf_new(struct super_block *sb)

{

	struct nilfs_segment_buffer *segbuf;

fs/nilfs2/segbuf.h

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ struct nilfs_segment_buffer { 
		    b_assoc_buffers))

#define NILFS_SEGBUF_BH_IS_LAST(bh, head)  ((bh)->b_assoc_buffers.next == head)



extern struct kmem_cache *nilfs_segbuf_cachep;



int __init nilfs_init_segbuf_cache(void);

void nilfs_destroy_segbuf_cache(void);

fs/nilfs2/segment.c

+0 −36
Original line number Diff line number Diff line
@@ -116,42 +116,6 @@ static void nilfs_dispose_list(struct nilfs_sb_info *, struct list_head *, 
#define nilfs_cnt32_lt(a, b)  nilfs_cnt32_gt(b, a)

#define nilfs_cnt32_le(a, b)  nilfs_cnt32_ge(b, a)



/*

 * Transaction

 */

static struct kmem_cache *nilfs_transaction_cachep;



/**

 * nilfs_init_transaction_cache - create a cache for nilfs_transaction_info

 *

 * nilfs_init_transaction_cache() creates a slab cache for the struct

 * nilfs_transaction_info.

 *

 * Return Value: On success, it returns 0. On error, one of the following

 * negative error code is returned.

 *

 * %-ENOMEM - Insufficient memory available.

 */

int nilfs_init_transaction_cache(void)

{

	nilfs_transaction_cachep =

		kmem_cache_create("nilfs2_transaction_cache",

				  sizeof(struct nilfs_transaction_info),

				  0, SLAB_RECLAIM_ACCOUNT, NULL);

	return (nilfs_transaction_cachep == NULL) ? -ENOMEM : 0;

}



/**

 * nilfs_destroy_transaction_cache - destroy the cache for transaction info

 *

 * nilfs_destroy_transaction_cache() frees the slab cache for the struct

 * nilfs_transaction_info.

 */

void nilfs_destroy_transaction_cache(void)

{

	kmem_cache_destroy(nilfs_transaction_cachep);

}



static int nilfs_prepare_segment_lock(struct nilfs_transaction_info *ti)

{

	struct nilfs_transaction_info *cur_ti = current->journal_info;