Commit bd3a5287 authored by David Sterba's avatar David Sterba
Browse files

btrfs: compression: inline put_workspace 



Similar to get_workspace, majority of the callbacks is trivial, we don't
gain anything by the indirection, so replace them by a switch function.
Trivial callback implementations use the helper.

Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 6a0d1272

fs/btrfs/compression.c

+15 −9
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ int zlib_decompress(struct list_head *ws, unsigned char *data_in, 
struct list_head *zlib_alloc_workspace(unsigned int level);

void zlib_free_workspace(struct list_head *ws);

struct list_head *zlib_get_workspace(unsigned int level);

void zlib_put_workspace(struct list_head *ws);



int lzo_compress_pages(struct list_head *ws, struct address_space *mapping,

		u64 start, struct page **pages, unsigned long *out_pages,
@@ -50,7 +49,6 @@ int lzo_decompress(struct list_head *ws, unsigned char *data_in, 
		size_t destlen);

struct list_head *lzo_alloc_workspace(unsigned int level);

void lzo_free_workspace(struct list_head *ws);

void lzo_put_workspace(struct list_head *ws);



int zstd_compress_pages(struct list_head *ws, struct address_space *mapping,

		u64 start, struct page **pages, unsigned long *out_pages,
@@ -873,11 +871,6 @@ struct heuristic_ws { 


static struct workspace_manager heuristic_wsm;



static void heuristic_put_workspace(struct list_head *ws)

{

	btrfs_put_workspace(&heuristic_wsm, ws);

}



static void free_heuristic_ws(struct list_head *ws)

{

	struct heuristic_ws *workspace;
@@ -919,7 +912,6 @@ fail: 


const struct btrfs_compress_op btrfs_heuristic_compress = {

	.workspace_manager = &heuristic_wsm,

	.put_workspace = heuristic_put_workspace,

	.alloc_workspace = alloc_heuristic_ws,

	.free_workspace = free_heuristic_ws,

};
@@ -1112,7 +1104,21 @@ wake: 


static void put_workspace(int type, struct list_head *ws)

{

	return btrfs_compress_op[type]->put_workspace(ws);

	struct workspace_manager *wsm;



	wsm = btrfs_compress_op[type]->workspace_manager;

	switch (type) {

	case BTRFS_COMPRESS_NONE: return btrfs_put_workspace(wsm, ws);

	case BTRFS_COMPRESS_ZLIB: return btrfs_put_workspace(wsm, ws);

	case BTRFS_COMPRESS_LZO:  return btrfs_put_workspace(wsm, ws);

	case BTRFS_COMPRESS_ZSTD: return zstd_put_workspace(ws);

	default:

		/*

		 * This can't happen, the type is validated several times

		 * before we get here.

		 */

		BUG();

	}

}



/*

fs/btrfs/compression.h

+0 −2
Original line number Diff line number Diff line
@@ -125,8 +125,6 @@ struct list_head *btrfs_get_workspace(struct workspace_manager *wsm, 
void btrfs_put_workspace(struct workspace_manager *wsm, struct list_head *ws);



struct btrfs_compress_op {

	void (*put_workspace)(struct list_head *ws);



	struct list_head *(*alloc_workspace)(unsigned int level);



	void (*free_workspace)(struct list_head *workspace);

fs/btrfs/lzo.c

+0 −6
Original line number Diff line number Diff line
@@ -63,11 +63,6 @@ struct workspace { 


static struct workspace_manager wsm;



void lzo_put_workspace(struct list_head *ws)

{

	btrfs_put_workspace(&wsm, ws);

}



void lzo_free_workspace(struct list_head *ws)

{

	struct workspace *workspace = list_entry(ws, struct workspace, list);
@@ -489,7 +484,6 @@ out: 


const struct btrfs_compress_op btrfs_lzo_compress = {

	.workspace_manager	= &wsm,

	.put_workspace		= lzo_put_workspace,

	.alloc_workspace	= lzo_alloc_workspace,

	.free_workspace		= lzo_free_workspace,

	.max_level		= 1,

fs/btrfs/zlib.c

+0 −6
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ struct list_head *zlib_get_workspace(unsigned int level) 
	return ws;

}



void zlib_put_workspace(struct list_head *ws)

{

	btrfs_put_workspace(&wsm, ws);

}



void zlib_free_workspace(struct list_head *ws)

{

	struct workspace *workspace = list_entry(ws, struct workspace, list);
@@ -405,7 +400,6 @@ next: 


const struct btrfs_compress_op btrfs_zlib_compress = {

	.workspace_manager	= &wsm,

	.put_workspace		= zlib_put_workspace,

	.alloc_workspace	= zlib_alloc_workspace,

	.free_workspace		= zlib_free_workspace,

	.max_level		= 9,

fs/btrfs/zstd.c

+0 −1
Original line number Diff line number Diff line
@@ -708,7 +708,6 @@ finish: 
const struct btrfs_compress_op btrfs_zstd_compress = {

	/* ZSTD uses own workspace manager */

	.workspace_manager = NULL,

	.put_workspace = zstd_put_workspace,

	.alloc_workspace = zstd_alloc_workspace,

	.free_workspace = zstd_free_workspace,

	.max_level	= ZSTD_BTRFS_MAX_LEVEL,

CRA Git | Maintained and supported by SUSTech CRA and CCSE