|
 |
887953 |
From b6feae228a82f34b88b67b8a8f8fa55189dcdb72 Mon Sep 17 00:00:00 2001
|
|
|
887953 |
From: Susant Palai <spalai@redhat.com>
|
|
|
887953 |
Date: Fri, 11 Jan 2019 13:00:59 +0530
|
|
|
887953 |
Subject: [PATCH 504/506] dht: Add NULL check for stbuf in dht_rmdir_lookup_cbk
|
|
|
887953 |
|
|
|
887953 |
> Change-Id: I2ced288113a369cc6497a77ac1871007df434da4
|
|
|
887953 |
> fixes: bz#1664647
|
|
|
887953 |
> Signed-off-by: Susant Palai <spalai@redhat.com>
|
|
|
887953 |
|
|
|
887953 |
upstream patch: https://review.gluster.org/#/c/glusterfs/+/22004/
|
|
|
887953 |
|
|
|
887953 |
Change-Id: Ib53b06f6bbf20e0fbf1663cddf7fd76b37f23186
|
|
|
887953 |
BUG: 1664529
|
|
|
887953 |
Signed-off-by: Susant Palai <spalai@redhat.com>
|
|
|
887953 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/160438
|
|
|
887953 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
887953 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
887953 |
---
|
|
|
887953 |
xlators/cluster/dht/src/dht-common.c | 4 ++--
|
|
|
887953 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
887953 |
|
|
|
887953 |
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
|
|
|
887953 |
index ff0099c1d..767c6a868 100644
|
|
|
887953 |
--- a/xlators/cluster/dht/src/dht-common.c
|
|
|
887953 |
+++ b/xlators/cluster/dht/src/dht-common.c
|
|
|
887953 |
@@ -9842,8 +9842,8 @@ dht_rmdir_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
|
|
|
887953 |
|
|
|
887953 |
gf_msg (this->name, GF_LOG_WARNING, op_errno,
|
|
|
887953 |
DHT_MSG_FILE_LOOKUP_FAILED,
|
|
|
887953 |
- "lookup failed for %s on %s (type=0%o)",
|
|
|
887953 |
- local->loc.path, src->name, stbuf->ia_type);
|
|
|
887953 |
+ "lookup failed for %s on %s", local->loc.path,
|
|
|
887953 |
+ src->name);
|
|
|
887953 |
goto err;
|
|
|
887953 |
}
|
|
|
887953 |
|
|
|
887953 |
--
|
|
|
887953 |
2.20.1
|
|
|
887953 |
|