4 files changed, 2 insertions, 66 deletions

diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c
index af99f6620b7e..a12fcc6c72b5 100644
--- a/drivers/staging/pohmelfs/inode.c
+++ b/drivers/staging/pohmelfs/inode.c
@@ -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;
diff --git a/drivers/staging/pohmelfs/net.c b/drivers/staging/pohmelfs/net.c
index 93a5921c36f4..11ecac026ca7 100644
--- a/drivers/staging/pohmelfs/net.c
+++ b/drivers/staging/pohmelfs/net.c
@@ -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;
         }
diff --git a/drivers/staging/pohmelfs/netfs.h b/drivers/staging/pohmelfs/netfs.h
index 2ff21ae5bb12..59f81cbf388c 100644
--- a/drivers/staging/pohmelfs/netfs.h
+++ b/drivers/staging/pohmelfs/netfs.h
@@ -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 */
diff --git a/drivers/staging/pohmelfs/trans.c b/drivers/staging/pohmelfs/trans.c
index bcb59425a21c..b89f9f36b350 100644
--- a/drivers/staging/pohmelfs/trans.c
+++ b/drivers/staging/pohmelfs/trans.c
@@ -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;