|
 |
cb8e9e |
From e872bee3a6b5d61b6f70245f16d3faa47566d138 Mon Sep 17 00:00:00 2001
|
|
|
cb8e9e |
From: Kotresh HR <khiremat@redhat.com>
|
|
|
cb8e9e |
Date: Sun, 28 Jun 2015 13:45:31 +0530
|
|
|
cb8e9e |
Subject: [PATCH 190/190] feature/performace: Fix broken build
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Fix the build broken because of upstream patch
|
|
|
cb8e9e |
http://review.gluster.org/#/c/9822/ and
|
|
|
cb8e9e |
corresponding downstream patch
|
|
|
cb8e9e |
https://code.engineering.redhat.com/gerrit/51256
|
|
|
cb8e9e |
|
|
|
cb8e9e |
BUG: 1231784
|
|
|
cb8e9e |
Change-Id: Ie172bc0b5c6a9f8feb94c58df82d1fe1b87f2c0e
|
|
|
cb8e9e |
Reviewed-On: http://review.gluster.org/11451
|
|
|
cb8e9e |
Signed-off-by: Kotresh HR <khiremat@redhat.com>
|
|
|
cb8e9e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/51768
|
|
|
cb8e9e |
Reviewed-by: Raghavendra Gowdappa <rgowdapp@redhat.com>
|
|
|
cb8e9e |
Tested-by: Raghavendra Gowdappa <rgowdapp@redhat.com>
|
|
|
cb8e9e |
---
|
|
|
cb8e9e |
xlators/performance/io-cache/src/Makefile.am | 2 +-
|
|
|
cb8e9e |
xlators/performance/io-threads/src/Makefile.am | 2 +-
|
|
|
cb8e9e |
xlators/performance/md-cache/src/Makefile.am | 2 +-
|
|
|
cb8e9e |
xlators/performance/open-behind/src/Makefile.am | 2 +-
|
|
|
cb8e9e |
xlators/performance/quick-read/src/Makefile.am | 2 +-
|
|
|
cb8e9e |
xlators/performance/read-ahead/src/Makefile.am | 2 +-
|
|
|
cb8e9e |
xlators/performance/readdir-ahead/src/Makefile.am | 2 +-
|
|
|
cb8e9e |
xlators/performance/symlink-cache/src/Makefile.am | 2 ++
|
|
|
cb8e9e |
xlators/performance/write-behind/src/Makefile.am | 2 +-
|
|
|
cb8e9e |
9 files changed, 10 insertions(+), 8 deletions(-)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/xlators/performance/io-cache/src/Makefile.am b/xlators/performance/io-cache/src/Makefile.am
|
|
|
cb8e9e |
index 155be99..2176ea7 100644
|
|
|
cb8e9e |
--- a/xlators/performance/io-cache/src/Makefile.am
|
|
|
cb8e9e |
+++ b/xlators/performance/io-cache/src/Makefile.am
|
|
|
cb8e9e |
@@ -6,7 +6,7 @@ io_cache_la_LDFLAGS = -module -avoid-version
|
|
|
cb8e9e |
io_cache_la_SOURCES = io-cache.c page.c ioc-inode.c
|
|
|
cb8e9e |
io_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
|
|
|
cb8e9e |
|
|
|
cb8e9e |
-noinst_HEADERS = io-cache.h ioc-mem-types.h
|
|
|
cb8e9e |
+noinst_HEADERS = io-cache.h ioc-mem-types.h io-cache-messages.h
|
|
|
cb8e9e |
|
|
|
cb8e9e |
AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
|
|
|
cb8e9e |
-I$(CONTRIBDIR)/rbtree
|
|
|
cb8e9e |
diff --git a/xlators/performance/io-threads/src/Makefile.am b/xlators/performance/io-threads/src/Makefile.am
|
|
|
cb8e9e |
index d63042e..36a7331 100644
|
|
|
cb8e9e |
--- a/xlators/performance/io-threads/src/Makefile.am
|
|
|
cb8e9e |
+++ b/xlators/performance/io-threads/src/Makefile.am
|
|
|
cb8e9e |
@@ -6,7 +6,7 @@ io_threads_la_LDFLAGS = -module -avoid-version
|
|
|
cb8e9e |
io_threads_la_SOURCES = io-threads.c
|
|
|
cb8e9e |
io_threads_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
|
|
|
cb8e9e |
|
|
|
cb8e9e |
-noinst_HEADERS = io-threads.h iot-mem-types.h
|
|
|
cb8e9e |
+noinst_HEADERS = io-threads.h iot-mem-types.h io-threads-messages.h
|
|
|
cb8e9e |
|
|
|
cb8e9e |
AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/xlators/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am
|
|
|
cb8e9e |
index 6f3d68b..8260b2b 100644
|
|
|
cb8e9e |
--- a/xlators/performance/md-cache/src/Makefile.am
|
|
|
cb8e9e |
+++ b/xlators/performance/md-cache/src/Makefile.am
|
|
|
cb8e9e |
@@ -6,7 +6,7 @@ md_cache_la_LDFLAGS = -module -avoid-version
|
|
|
cb8e9e |
md_cache_la_SOURCES = md-cache.c
|
|
|
cb8e9e |
md_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
|
|
|
cb8e9e |
|
|
|
cb8e9e |
-noinst_HEADERS = md-cache-mem-types.h
|
|
|
cb8e9e |
+noinst_HEADERS = md-cache-mem-types.h md-cache-messages.h
|
|
|
cb8e9e |
|
|
|
cb8e9e |
AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
|
|
|
cb8e9e |
-I$(CONTRIBDIR)/rbtree
|
|
|
cb8e9e |
diff --git a/xlators/performance/open-behind/src/Makefile.am b/xlators/performance/open-behind/src/Makefile.am
|
|
|
cb8e9e |
index 1252857..eb6dfb1 100644
|
|
|
cb8e9e |
--- a/xlators/performance/open-behind/src/Makefile.am
|
|
|
cb8e9e |
+++ b/xlators/performance/open-behind/src/Makefile.am
|
|
|
cb8e9e |
@@ -6,7 +6,7 @@ open_behind_la_LDFLAGS = -module -avoid-version
|
|
|
cb8e9e |
open_behind_la_SOURCES = open-behind.c
|
|
|
cb8e9e |
open_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
|
|
|
cb8e9e |
|
|
|
cb8e9e |
-noinst_HEADERS = open-behind-mem-types.h
|
|
|
cb8e9e |
+noinst_HEADERS = open-behind-mem-types.h open-behind-messages.h
|
|
|
cb8e9e |
|
|
|
cb8e9e |
AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/xlators/performance/quick-read/src/Makefile.am b/xlators/performance/quick-read/src/Makefile.am
|
|
|
cb8e9e |
index 4906f40..6344aaf 100644
|
|
|
cb8e9e |
--- a/xlators/performance/quick-read/src/Makefile.am
|
|
|
cb8e9e |
+++ b/xlators/performance/quick-read/src/Makefile.am
|
|
|
cb8e9e |
@@ -6,7 +6,7 @@ quick_read_la_LDFLAGS = -module -avoid-version
|
|
|
cb8e9e |
quick_read_la_SOURCES = quick-read.c
|
|
|
cb8e9e |
quick_read_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
|
|
|
cb8e9e |
|
|
|
cb8e9e |
-noinst_HEADERS = quick-read.h quick-read-mem-types.h
|
|
|
cb8e9e |
+noinst_HEADERS = quick-read.h quick-read-mem-types.h quick-read-messages.h
|
|
|
cb8e9e |
|
|
|
cb8e9e |
AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/xlators/performance/read-ahead/src/Makefile.am b/xlators/performance/read-ahead/src/Makefile.am
|
|
|
cb8e9e |
index be80ae7..56823b3 100644
|
|
|
cb8e9e |
--- a/xlators/performance/read-ahead/src/Makefile.am
|
|
|
cb8e9e |
+++ b/xlators/performance/read-ahead/src/Makefile.am
|
|
|
cb8e9e |
@@ -6,7 +6,7 @@ read_ahead_la_LDFLAGS = -module -avoid-version
|
|
|
cb8e9e |
read_ahead_la_SOURCES = read-ahead.c page.c
|
|
|
cb8e9e |
read_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
|
|
|
cb8e9e |
|
|
|
cb8e9e |
-noinst_HEADERS = read-ahead.h read-ahead-mem-types.h
|
|
|
cb8e9e |
+noinst_HEADERS = read-ahead.h read-ahead-mem-types.h read-ahead-messages.h
|
|
|
cb8e9e |
|
|
|
cb8e9e |
AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/xlators/performance/readdir-ahead/src/Makefile.am b/xlators/performance/readdir-ahead/src/Makefile.am
|
|
|
cb8e9e |
index 539d6ed..70525f4 100644
|
|
|
cb8e9e |
--- a/xlators/performance/readdir-ahead/src/Makefile.am
|
|
|
cb8e9e |
+++ b/xlators/performance/readdir-ahead/src/Makefile.am
|
|
|
cb8e9e |
@@ -6,7 +6,7 @@ readdir_ahead_la_LDFLAGS = -module -avoid-version
|
|
|
cb8e9e |
readdir_ahead_la_SOURCES = readdir-ahead.c
|
|
|
cb8e9e |
readdir_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
|
|
|
cb8e9e |
|
|
|
cb8e9e |
-noinst_HEADERS = readdir-ahead.h readdir-ahead-mem-types.h
|
|
|
cb8e9e |
+noinst_HEADERS = readdir-ahead.h readdir-ahead-mem-types.h readdir-ahead-messages.h
|
|
|
cb8e9e |
|
|
|
cb8e9e |
AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/xlators/performance/symlink-cache/src/Makefile.am b/xlators/performance/symlink-cache/src/Makefile.am
|
|
|
cb8e9e |
index 4091c32..4be8968 100644
|
|
|
cb8e9e |
--- a/xlators/performance/symlink-cache/src/Makefile.am
|
|
|
cb8e9e |
+++ b/xlators/performance/symlink-cache/src/Makefile.am
|
|
|
cb8e9e |
@@ -6,6 +6,8 @@ symlink_cache_la_LDFLAGS = -module -avoid-version
|
|
|
cb8e9e |
symlink_cache_la_SOURCES = symlink-cache.c
|
|
|
cb8e9e |
symlink_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
|
|
|
cb8e9e |
|
|
|
cb8e9e |
+noinst_HEADERS = symlink-cache-messages.h
|
|
|
cb8e9e |
+
|
|
|
cb8e9e |
AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src
|
|
|
cb8e9e |
|
|
|
cb8e9e |
AM_CFLAGS = -Wall $(GF_CFLAGS)
|
|
|
cb8e9e |
diff --git a/xlators/performance/write-behind/src/Makefile.am b/xlators/performance/write-behind/src/Makefile.am
|
|
|
cb8e9e |
index 6c829d8..8f2b664 100644
|
|
|
cb8e9e |
--- a/xlators/performance/write-behind/src/Makefile.am
|
|
|
cb8e9e |
+++ b/xlators/performance/write-behind/src/Makefile.am
|
|
|
cb8e9e |
@@ -6,7 +6,7 @@ write_behind_la_LDFLAGS = -module -avoid-version
|
|
|
cb8e9e |
write_behind_la_SOURCES = write-behind.c
|
|
|
cb8e9e |
write_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
|
|
|
cb8e9e |
|
|
|
cb8e9e |
-noinst_HEADERS = write-behind-mem-types.h
|
|
|
cb8e9e |
+noinst_HEADERS = write-behind-mem-types.h write-behind-messages.h
|
|
|
cb8e9e |
|
|
|
cb8e9e |
AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src
|
|
|
cb8e9e |
|
|
|
cb8e9e |
--
|
|
|
cb8e9e |
1.7.1
|
|
|
cb8e9e |
|