|
|
21ab4e |
From 51b26b20f0d02a103395989292a2f0f587131dee Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Pranith Kumar K <pkarampu@redhat.com>
|
|
|
21ab4e |
Date: Fri, 31 Mar 2017 14:59:33 +0530
|
|
|
21ab4e |
Subject: [PATCH 362/362] features/trash: Fix bad backport
|
|
|
21ab4e |
|
|
|
21ab4e |
Commit 3fdcdc960f8479be6216cc3f53b1972724fa0724 is not backported from
|
|
|
21ab4e |
upstream patch https://review.gluster.org/16567 cleanly which caused
|
|
|
21ab4e |
mount to be hung. Fixed that part now.
|
|
|
21ab4e |
|
|
|
21ab4e |
Label : DOWNSTREAM ONLY
|
|
|
21ab4e |
|
|
|
21ab4e |
BUG: 1437782
|
|
|
21ab4e |
Change-Id: I9fe7d8b61e96393080b49d4365f5e8ce3617c908
|
|
|
21ab4e |
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/102100
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
xlators/features/trash/src/trash.c | 6 +++---
|
|
|
21ab4e |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/xlators/features/trash/src/trash.c b/xlators/features/trash/src/trash.c
|
|
|
21ab4e |
index 0e8cf79..fd5507f 100644
|
|
|
21ab4e |
--- a/xlators/features/trash/src/trash.c
|
|
|
21ab4e |
+++ b/xlators/features/trash/src/trash.c
|
|
|
21ab4e |
@@ -2170,8 +2170,9 @@ notify (xlator_t *this, int event, void *data, ...)
|
|
|
21ab4e |
goto out;
|
|
|
21ab4e |
}
|
|
|
21ab4e |
|
|
|
21ab4e |
- if (!priv->state) {
|
|
|
21ab4e |
- gf_log (this->name, GF_LOG_DEBUG, "trash xlator is off");
|
|
|
21ab4e |
+ dict = dict_new ();
|
|
|
21ab4e |
+ if (!dict) {
|
|
|
21ab4e |
+ ret = ENOMEM;
|
|
|
21ab4e |
goto out;
|
|
|
21ab4e |
}
|
|
|
21ab4e |
priv->trash_itable = inode_table_new (0, this);
|
|
|
21ab4e |
@@ -2472,7 +2473,6 @@ init (xlator_t *this)
|
|
|
21ab4e |
goto out;
|
|
|
21ab4e |
}
|
|
|
21ab4e |
|
|
|
21ab4e |
- priv->trash_itable = inode_table_new (0, this);
|
|
|
21ab4e |
gf_log (this->name, GF_LOG_DEBUG, "brick path is%s", priv->brick_path);
|
|
|
21ab4e |
|
|
|
21ab4e |
this->private = (void *)priv;
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|