Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff... Commit: 34c0872f1895924b94fe4ccf502c27ba97880792 Parent: c9ce73c2a3381f227024e44f1d7b04adc6de87c2 Author: David Teigland teigland@redhat.com AuthorDate: Fri Nov 11 14:30:44 2011 -0600 Committer: David Teigland teigland@redhat.com CommitterDate: Fri Nov 11 14:35:42 2011 -0600
gfs_controld: don't ignore dlmc_fs_register error
gfs_controld ignores an error returned by dlm_controld for dlmc_fs_register() during mount. This results in a successful mount, but dlm/gfs recovery not being coordinated. The mount should return an error instead.
bz 753300
Signed-off-by: David Teigland teigland@redhat.com --- group/gfs_controld/cpg-new.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/group/gfs_controld/cpg-new.c b/group/gfs_controld/cpg-new.c index a72d0f1..8cf2b00 100644 --- a/group/gfs_controld/cpg-new.c +++ b/group/gfs_controld/cpg-new.c @@ -775,11 +775,12 @@ void process_dlmcontrol(int ci) if (result) { /* shouldn't happen */ log_error("process_dlmcontrol register %d", result); - } else + client_reply_join_full(mg, result); + mg->mount_client_notified = 1; + } else { log_group(mg, "process_dlmcontrol register %d", result); - - mg->dlm_registered = 1; - + mg->dlm_registered = 1; + } } else { log_group(mg, "process_dlmcontrol unknown type %d", type); }