From f6ac7f6f6e28c7567e05c701f88fbdd6a971bf29 Mon Sep 17 00:00:00 2001 From: Pavan Sondur Date: Mon, 31 May 2010 22:43:57 +0000 Subject: cluster/afr: Check before accessing xattrs in data self heal. The lookup xattrs might be null, because a lookup might not have been issued during self heal, especially if only data self heal is required. Signed-off-by: Pavan Vilas Sondur Signed-off-by: Anand V. Avati BUG: 815 (quick-read and replicate self-heal interaction result in empty reads) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=815 BUG: 815 (quick-read and replicate self-heal interaction result in empty reads) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=815 --- xlators/cluster/afr/src/afr-self-heal-data.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'xlators') diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c index e29c1def..366cac81 100644 --- a/xlators/cluster/afr/src/afr-self-heal-data.c +++ b/xlators/cluster/afr/src/afr-self-heal-data.c @@ -741,7 +741,8 @@ afr_sh_data_fix (call_frame_t *frame, xlator_t *this) */ dict_unref (orig_local->cont.lookup.xattr); - orig_local->cont.lookup.xattr = dict_ref (orig_local->cont.lookup.xattrs[sh->source]); + if (orig_local->cont.lookup.xattrs) + orig_local->cont.lookup.xattr = dict_ref (orig_local->cont.lookup.xattrs[sh->source]); if (sh->background) { sh->unwind (sh->orig_frame, this); -- cgit