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

Commit 50e4babf authored by Evgeniy Polyakov's avatar Evgeniy Polyakov Committed by Greg Kroah-Hartman
Browse files

Staging: Pohmelfs: Drop ftrans debugging code. 



Signed-off-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b82ba780

drivers/staging/pohmelfs/inode.c

+0 −4
Original line number Diff line number Diff line
@@ -1343,8 +1343,6 @@ static void pohmelfs_put_super(struct super_block *sb) 


	kfree(psb);

	sb->s_fs_info = NULL;



	pohmelfs_ftrans_exit();

}



static int pohmelfs_statfs(struct dentry *dentry, struct kstatfs *buf)
@@ -1783,8 +1781,6 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent) 
	struct pohmelfs_inode *npi;

	struct qstr str;



	pohmelfs_ftrans_init();



	psb = kzalloc(sizeof(struct pohmelfs_sb), GFP_KERNEL);

	if (!psb)

		goto err_out_exit;

drivers/staging/pohmelfs/net.c

+2 −54
Original line number Diff line number Diff line
@@ -26,55 +26,6 @@ 


#include "netfs.h"



static int pohmelfs_ftrans_size = 10240;

static u32 *pohmelfs_ftrans;



int pohmelfs_ftrans_init(void)

{

	pohmelfs_ftrans = vmalloc(pohmelfs_ftrans_size * 4);

	if (!pohmelfs_ftrans)

		return -ENOMEM;



	return 0;

}



void pohmelfs_ftrans_exit(void)

{

	vfree(pohmelfs_ftrans);

}



void pohmelfs_ftrans_clean(u64 id)

{

	if (pohmelfs_ftrans) {

		u32 i = id & 0xffffffff;

		int idx = i % pohmelfs_ftrans_size;



		pohmelfs_ftrans[idx] = 0;

	}

}



void pohmelfs_ftrans_update(u64 id)

{

	if (pohmelfs_ftrans) {

		u32 i = id & 0xffffffff;

		int idx = i % pohmelfs_ftrans_size;



		pohmelfs_ftrans[idx] = i;

	}

}



int pohmelfs_ftrans_check(u64 id)

{

	if (pohmelfs_ftrans) {

		u32 i = id & 0xffffffff;

		int idx = i % pohmelfs_ftrans_size;



		return (pohmelfs_ftrans[idx] == i);

	}



	return -1;

}



/*

 * Async machinery lives here.

 * All commands being sent to server do _not_ require sync reply,
@@ -654,15 +605,12 @@ static int pohmelfs_transaction_response(struct netfs_state *st) 
	if (dst) {

		netfs_trans_remove_nolock(dst, st);

		t = dst->trans;



		pohmelfs_ftrans_update(cmd->start);

	}

	mutex_unlock(&st->trans_lock);



	if (!t) {

		int check = pohmelfs_ftrans_check(cmd->start);

		printk("%s: failed to find transaction: start: %llu: id: %llu, size: %u, ext: %u, double: %d.\n",

				__func__, cmd->start, cmd->id, cmd->size, cmd->ext, check);

		printk("%s: failed to find transaction: start: %llu: id: %llu, size: %u, ext: %u.\n",

				__func__, cmd->start, cmd->id, cmd->size, cmd->ext);

		err = -EINVAL;

		goto out;

	}

drivers/staging/pohmelfs/netfs.h

+0 −6
Original line number Diff line number Diff line
@@ -921,12 +921,6 @@ static inline void pohmelfs_mcache_put(struct pohmelfs_sb *psb, 
		pohmelfs_mcache_free(psb, m);

}



int pohmelfs_ftrans_init(void);

void pohmelfs_ftrans_exit(void);

void pohmelfs_ftrans_update(u64 id);

int pohmelfs_ftrans_check(u64 id);

void pohmelfs_ftrans_clean(u64 id);



#endif /* __KERNEL__*/



#endif /* __NETFS_H */

drivers/staging/pohmelfs/trans.c

+0 −2
Original line number Diff line number Diff line
@@ -501,8 +501,6 @@ int netfs_trans_finish(struct netfs_trans *t, struct pohmelfs_sb *psb) 


	t->gen = atomic_inc_return(&psb->trans_gen);



	pohmelfs_ftrans_clean(t->gen);



	cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +

		t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);

	cmd->cmd = NETFS_TRANS;