summaryrefslogtreecommitdiffstats
path: root/libglusterfs/src/Makefile.am
diff options
context:
space:
mode:
authorN Balachandran <nbalacha@redhat.com>2016-07-26 11:57:18 +0530
committerNiels de Vos <ndevos@redhat.com>2016-07-26 08:14:02 -0700
commited1c986bff37e783a19fc43e38066a74ece13cc5 (patch)
tree6efba2c460a11e2b6e817576cd2383607f3f38c3 /libglusterfs/src/Makefile.am
parentc35dc4fb18e6d942ae773fd1e6ab1636bcdd1788 (diff)
features/ctr: Check for NULL local
This is a defensive fix to prevent a crash reported during a rename operation. This is not reproducible under normal circumstances. This patch also moves ctr-messages.h to the src dir of the changetimerecorder xlator. Backported from master: http://review.gluster.org/#/c/14964/ Change-Id: If459f46d3ce9258f595d0ca7ef55942bf466d767 BUG: 1360122 Signed-off-by: N Balachandran <nbalacha@redhat.com> Reviewed-on: http://review.gluster.org/15009 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'libglusterfs/src/Makefile.am')
-rw-r--r--libglusterfs/src/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am
index 63feb380e66..2a4f76421fa 100644
--- a/libglusterfs/src/Makefile.am
+++ b/libglusterfs/src/Makefile.am
@@ -50,7 +50,7 @@ libglusterfs_la_HEADERS = common-utils.h defaults.h default-args.h \
event-history.h gidcache.h client_t.h glusterfs-acl.h \
glfs-message-id.h template-component-messages.h strfd.h \
syncop-utils.h parse-utils.h libglusterfs-messages.h tw.h \
- ctr-messages.h lvm-defaults.h quota-common-utils.h rot-buffs.h \
+ lvm-defaults.h quota-common-utils.h rot-buffs.h \
compat-uuid.h upcall-utils.h
libglusterfs_ladir = $(includedir)/glusterfs