andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

misc updates in mainline

Browse Source 
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
This commit is contained in:
Amar Tumballi 2010-06-21 04:26:14 +00:00 committed by Anand V. Avati
parent 002ab96fd3
commit 7ac6287fb6
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -14,7 +14,7 @@ dnl
dnl You should have received a copy of the GNU General Public License 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/>. 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 AM_INIT_AUTOMAKE

2
libglusterfs/src/defaults.c
View File

@ -1277,7 +1277,7 @@ default_notify (xlator_t *this, int32_t event, void *data, ...)
{ {
xlator_list_t *parent = this->parents; xlator_list_t *parent = this->parents;
while (parent) { while (parent) {
if (parent->xlator->ready) if (parent->xlator->init_succeeded)
xlator_notify (parent->xlator, event, xlator_notify (parent->xlator, event,
this, NULL); this, NULL);
parent = parent->next; parent = parent->next;

1
libglusterfs/src/xlator.h
View File

@ -836,7 +836,6 @@ struct _xlator {
glusterfs_ctx_t *ctx; glusterfs_ctx_t *ctx;
glusterfs_graph_t *graph; /* not set for fuse */ glusterfs_graph_t *graph; /* not set for fuse */
inode_table_t *itable; inode_table_t *itable;
char ready;
char init_succeeded; char init_succeeded;
void *private; void *private;
struct mem_acct mem_acct; struct mem_acct mem_acct;

2
xlators/protocol/legacy/client/src/client-protocol.c
View File

@ -6506,7 +6506,7 @@ int
notify (xlator_t *this, int32_t event, void *data, ...) notify (xlator_t *this, int32_t event, void *data, ...)
{ {
int i = 0; int i = 0;
int ret = -1; int ret = 0;
int child_down = 1; int child_down = 1;
int was_not_down = 0; int was_not_down = 0;
transport_t *trans = NULL; transport_t *trans = NULL;