diff options
| author | Mohit Agrawal <moagrawa@redhat.com> | 2018-05-23 09:06:04 +0530 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2018-05-25 02:05:37 +0000 |
| commit | 7b95d5a4b3988757bf8c91f82dcaf86ed3da6875 (patch) | |
| tree | 899253a1bcbc3f10988cbe038f47cce61823bcea /xlators/features/trash/src/trash.c | |
| parent | 57dd3692d1a10d446db7fe919497335984e2cd3f (diff) | |
Revert "gluster: Sometimes Brick process is crashed at the time of stopping brick"
Updates: bz#1582286
This reverts commit 0043c63f70776444f69667a4ef9596217ecb42b7.
Change-Id: Iab3b4f4a54e122c589e515add93c6effc966b3e0
Diffstat (limited to 'xlators/features/trash/src/trash.c')
| -rw-r--r-- | xlators/features/trash/src/trash.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/xlators/features/trash/src/trash.c b/xlators/features/trash/src/trash.c index 8a92685cf4b..e8f8b7bf051 100644 --- a/xlators/features/trash/src/trash.c +++ b/xlators/features/trash/src/trash.c @@ -2616,24 +2616,16 @@ fini (xlator_t *this) GF_VALIDATE_OR_GOTO ("trash", this, out); priv = this->private; + inode_table = priv->trash_itable; if (priv) { - inode_table = priv->trash_itable; - if (priv->newtrash_dir) { + if (priv->newtrash_dir) GF_FREE (priv->newtrash_dir); - priv->newtrash_dir = NULL; - } - if (priv->oldtrash_dir) { + if (priv->oldtrash_dir) GF_FREE (priv->oldtrash_dir); - priv->oldtrash_dir = NULL; - } - if (priv->brick_path) { + if (priv->brick_path) GF_FREE (priv->brick_path); - priv->brick_path = NULL; - } - if (priv->eliminate) { + if (priv->eliminate) wipe_eliminate_path (&priv->eliminate); - priv->eliminate = NULL; - } if (inode_table) { inode_table_destroy (inode_table); priv->trash_itable = NULL; |