summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2010-06-21 04:26:14 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-06-21 20:21:17 -0700
commit7ac6287fb65bdddf3874f3a2c2602e857fbc6b87 (patch)
tree52865ed0410b28c5a6c5b0b4855b5c11ba495b4a
parent002ab96fd30f8924533fc454ecea00be04c013d5 (diff)
misc updates in mainline
Signed-off-by: Amar Tumballi <amar@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 875 (Implement a new protocol to provide proper backward/forward compatibility) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=875
-rw-r--r--configure.ac2
-rw-r--r--libglusterfs/src/defaults.c2
-rw-r--r--libglusterfs/src/xlator.h1
-rw-r--r--xlators/protocol/legacy/client/src/client-protocol.c2
4 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 0347ca5..ffe87e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([glusterfs],[3.0.0git],[gluster-users@gluster.org])
+AC_INIT([glusterfs],[3.1.0git],[gluster-users@gluster.org])
AM_INIT_AUTOMAKE
diff --git a/libglusterfs/src/defaults.c b/libglusterfs/src/defaults.c
index 7da589d..7736491 100644
--- a/libglusterfs/src/defaults.c
+++ b/libglusterfs/src/defaults.c
@@ -1277,7 +1277,7 @@ default_notify (xlator_t *this, int32_t event, void *data, ...)
{
xlator_list_t *parent = this->parents;
while (parent) {
- if (parent->xlator->ready)
+ if (parent->xlator->init_succeeded)
xlator_notify (parent->xlator, event,
this, NULL);
parent = parent->next;
diff --git a/libglusterfs/src/xlator.h b/libglusterfs/src/xlator.h
index 142423d..38ef4bf 100644
--- a/libglusterfs/src/xlator.h
+++ b/libglusterfs/src/xlator.h
@@ -836,7 +836,6 @@ struct _xlator {
glusterfs_ctx_t *ctx;
glusterfs_graph_t *graph; /* not set for fuse */
inode_table_t *itable;
- char ready;
char init_succeeded;
void *private;
struct mem_acct mem_acct;
diff --git a/xlators/protocol/legacy/client/src/client-protocol.c b/xlators/protocol/legacy/client/src/client-protocol.c
index 50030f8..dae31dc 100644
--- a/xlators/protocol/legacy/client/src/client-protocol.c
+++ b/xlators/protocol/legacy/client/src/client-protocol.c
@@ -6506,7 +6506,7 @@ int
notify (xlator_t *this, int32_t event, void *data, ...)
{
int i = 0;
- int ret = -1;
+ int ret = 0;
int child_down = 1;
int was_not_down = 0;
transport_t *trans = NULL;