diff options
Diffstat (limited to 'libglusterfs')
| -rw-r--r-- | libglusterfs/src/call-stub.c | 6 | ||||
| -rw-r--r-- | libglusterfs/src/fd.c | 4 | ||||
| -rw-r--r-- | libglusterfs/src/graph.c | 4 | ||||
| -rw-r--r-- | libglusterfs/src/graph.y | 5 | ||||
| -rw-r--r-- | libglusterfs/src/inode.c | 10 |
5 files changed, 0 insertions, 29 deletions
diff --git a/libglusterfs/src/call-stub.c b/libglusterfs/src/call-stub.c index 67543c64a13..8761b40a0c6 100644 --- a/libglusterfs/src/call-stub.c +++ b/libglusterfs/src/call-stub.c @@ -3822,12 +3822,8 @@ call_stub_destroy_unwind (call_stub_t *stub) void call_stub_destroy (call_stub_t *stub) { - struct mem_pool *tmp_pool = NULL; - GF_VALIDATE_OR_GOTO ("call-stub", stub, out); - tmp_pool = stub->stub_mem_pool; - if (stub->wind) { call_stub_destroy_wind (stub); } else { @@ -3837,8 +3833,6 @@ call_stub_destroy (call_stub_t *stub) stub->stub_mem_pool = NULL; mem_put (stub); out: - tmp_pool = NULL; - return; } diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c index d6c4806a11a..7779dfe2551 100644 --- a/libglusterfs/src/fd.c +++ b/libglusterfs/src/fd.c @@ -383,7 +383,6 @@ fd_destroy (fd_t *fd) xlator_t *xl = NULL; int i = 0; xlator_t *old_THIS = NULL; - struct mem_pool *tmp_pool = NULL; if (fd == NULL){ gf_log_callingfn ("xlator", GF_LOG_ERROR, "invalid arugument"); @@ -397,8 +396,6 @@ fd_destroy (fd_t *fd) if (!fd->_ctx) goto out; - tmp_pool = fd->inode->table->fd_mem_pool; - if (IA_ISDIR (fd->inode->ia_type)) { for (i = 0; i < fd->xl_count; i++) { if (fd->_ctx[i].key) { @@ -429,7 +426,6 @@ fd_destroy (fd_t *fd) inode_unref (fd->inode); fd->inode = (inode_t *)0xaaaaaaaa; mem_put (fd); - tmp_pool = NULL; out: return; } diff --git a/libglusterfs/src/graph.c b/libglusterfs/src/graph.c index 1d7d943e66e..7844a547551 100644 --- a/libglusterfs/src/graph.c +++ b/libglusterfs/src/graph.c @@ -283,7 +283,6 @@ gf_add_cmdline_options (glusterfs_graph_t *graph, cmd_args_t *cmd_args) int glusterfs_graph_validate_options (glusterfs_graph_t *graph) { - volume_opt_list_t *vol_opt = NULL; xlator_t *trav = NULL; int ret = -1; char *errstr = NULL; @@ -294,9 +293,6 @@ glusterfs_graph_validate_options (glusterfs_graph_t *graph) if (list_empty (&trav->volume_options)) continue; - vol_opt = list_entry (trav->volume_options.next, - volume_opt_list_t, list); - ret = xlator_options_validate (trav, trav->options, &errstr); if (ret) { gf_log (trav->name, GF_LOG_ERROR, diff --git a/libglusterfs/src/graph.y b/libglusterfs/src/graph.y index 10aa4546b2e..62c57dd6c5f 100644 --- a/libglusterfs/src/graph.y +++ b/libglusterfs/src/graph.y @@ -445,8 +445,6 @@ preprocess (FILE *srcfp, FILE *dstfp) char in_backtick = 0; int line = 1; int column = 0; - int backtick_line = 0; - int backtick_column = 0; int character = 0; @@ -484,9 +482,6 @@ preprocess (FILE *srcfp, FILE *dstfp) } else { i = 0; cmd[i] = '\0'; - - backtick_column = column; - backtick_line = line; } in_backtick = !in_backtick; diff --git a/libglusterfs/src/inode.c b/libglusterfs/src/inode.c index 1b43203113f..7f938236738 100644 --- a/libglusterfs/src/inode.c +++ b/libglusterfs/src/inode.c @@ -134,14 +134,11 @@ __dentry_unhash (dentry_t *dentry) static void __dentry_unset (dentry_t *dentry) { - struct mem_pool *tmp_pool = NULL; - if (!dentry) { gf_log_callingfn (THIS->name, GF_LOG_WARNING, "dentry not found"); return; } - tmp_pool = dentry->inode->table->dentry_pool; __dentry_unhash (dentry); list_del_init (&dentry->inode_list); @@ -155,8 +152,6 @@ __dentry_unset (dentry_t *dentry) } mem_put (dentry); - tmp_pool = NULL; - } @@ -307,7 +302,6 @@ __inode_destroy (inode_t *inode) int index = 0; xlator_t *xl = NULL; xlator_t *old_THIS = NULL; - struct mem_pool *tmp_pool = NULL; if (!inode) { gf_log_callingfn (THIS->name, GF_LOG_WARNING, "inode not found"); @@ -319,8 +313,6 @@ __inode_destroy (inode_t *inode) goto noctx; } - tmp_pool = inode->table->inode_pool; - for (index = 0; index < inode->table->xl->graph->xl_count; index++) { if (inode->_ctx[index].xl_key) { xl = (xlator_t *)(long)inode->_ctx[index].xl_key; @@ -337,8 +329,6 @@ noctx: LOCK_DESTROY (&inode->lock); // memset (inode, 0xb, sizeof (*inode)); mem_put (inode); - tmp_pool = NULL; - } |