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

btrfs: compression: pass type to btrfs_put_workspace 



We can infer the workspace_manager from type and the type will be used
in the following patch to call a common helper for free_workspace.

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 c778df14

fs/btrfs/compression.c

+6 −7
Original line number Diff line number Diff line
@@ -1086,14 +1086,16 @@ static struct list_head *get_workspace(int type, int level) 
 * put a workspace struct back on the list or free it if we have enough

 * idle ones sitting around

 */

void btrfs_put_workspace(struct workspace_manager *wsm, struct list_head *ws)

void btrfs_put_workspace(int type, struct list_head *ws)

{

	struct workspace_manager *wsm;

	struct list_head *idle_ws;

	spinlock_t *ws_lock;

	atomic_t *total_ws;

	wait_queue_head_t *ws_wait;

	int *free_ws;



	wsm = btrfs_compress_op[type]->workspace_manager;

	idle_ws	 = &wsm->idle_ws;

	ws_lock	 = &wsm->ws_lock;

	total_ws = &wsm->total_ws;
@@ -1117,13 +1119,10 @@ wake: 


static void put_workspace(int type, struct list_head *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_NONE: return btrfs_put_workspace(type, ws);

	case BTRFS_COMPRESS_ZLIB: return btrfs_put_workspace(type, ws);

	case BTRFS_COMPRESS_LZO:  return btrfs_put_workspace(type, ws);

	case BTRFS_COMPRESS_ZSTD: return zstd_put_workspace(ws);

	default:

		/*

fs/btrfs/compression.h

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ struct workspace_manager { 
};



struct list_head *btrfs_get_workspace(int type, unsigned int level);

void btrfs_put_workspace(struct workspace_manager *wsm, struct list_head *ws);

void btrfs_put_workspace(int type, struct list_head *ws);



struct btrfs_compress_op {

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE