Ocfs2 devel - Jul 2009 - [PATCH 1/1] ocfs2-devel: trivial fix for s/migrate/migration/ in dlmrecovery.c, line 1121

in dlmrecovery.c:1121, replace 'migrate' to 'migration' to keep
the consistency
by comparing to other lines with the similar log info in the same file.

Signed-off-by: Jeff Liu <jeff.liu at oracle.com>
---
 fs/ocfs2/dlm/dlmrecovery.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index bcb9260..43e6e32 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -1118,7 +1118,7 @@ static int dlm_send_mig_lockres_msg(struct dlm_ctxt *dlm,
 
 	mlog(0, "%s:%.*s: sending mig lockres (%s) to %u\n",
 	     dlm->name, res->lockname.len, res->lockname.name,
-	     orig_flags & DLM_MRES_MIGRATION ? "migrate" :
"recovery",
+	     orig_flags & DLM_MRES_MIGRATION ? "migration" :
"recovery",
 	     send_to);
 
 	/* send it */
-- 
1.5.4.3

Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>

Jeff Liu wrote:
> in dlmrecovery.c:1121, replace 'migrate' to 'migration' to
keep the consistency
> by comparing to other lines with the similar log info in the same file.
>
> Signed-off-by: Jeff Liu <jeff.liu at oracle.com>
> ---
>  fs/ocfs2/dlm/dlmrecovery.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
> index bcb9260..43e6e32 100644
> --- a/fs/ocfs2/dlm/dlmrecovery.c
> +++ b/fs/ocfs2/dlm/dlmrecovery.c
> @@ -1118,7 +1118,7 @@ static int dlm_send_mig_lockres_msg(struct dlm_ctxt
*dlm,
>  
>  	mlog(0, "%s:%.*s: sending mig lockres (%s) to %u\n",
>  	     dlm->name, res->lockname.len, res->lockname.name,
> -	     orig_flags & DLM_MRES_MIGRATION ? "migrate" :
"recovery",
> +	     orig_flags & DLM_MRES_MIGRATION ? "migration" :
"recovery",
>  	     send_to);
>  
>  	/* send it */

On Tue, Jul 07, 2009 at 03:51:40PM +0800, Jeff Liu
wrote:
> in dlmrecovery.c:1121, replace 'migrate' to 'migration' to
keep the consistency
> by comparing to other lines with the similar log info in the same file.
> 
> Signed-off-by: Jeff Liu <jeff.liu at oracle.com>
	This is now part of the fixes branch of ocfs2.git

Joel

-- 

"You can get more with a kind word and a gun than you can with
 a kind word alone."
         - Al Capone

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127