Ocfs2 devel - May 2009 - [PATCH] ocfs2/trivial: Code cleanup of ocfs2_mount_volume.

No need for nonsense "goto leave" in the end of ocfs2_mount_volume.

Signed-off-by: Tao Ma <tao.ma at oracle.com>
---
 fs/ocfs2/super.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 79ff8d9..4601a57 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -1766,13 +1766,8 @@ static int ocfs2_mount_volume(struct super_block *sb)
 	}
 
 	status = ocfs2_truncate_log_init(osb);
-	if (status < 0) {
+	if (status < 0)
 		mlog_errno(status);
-		goto leave;
-	}
-
-	if (ocfs2_mount_local(osb))
-		goto leave;
 
 leave:
 	if (unlock_super)
-- 
1.6.1.40.g8ea6a

Tao Ma wrote:
> No need for nonsense "goto leave" in the end of
ocfs2_mount_volume.
>
> Signed-off-by: Tao Ma <tao.ma at oracle.com>
>   
Remove redundant gotos in ocfs2_mount_volume().

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

> ---
>  fs/ocfs2/super.c |    7 +------
>  1 files changed, 1 insertions(+), 6 deletions(-)
>
> diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
> index 79ff8d9..4601a57 100644
> --- a/fs/ocfs2/super.c
> +++ b/fs/ocfs2/super.c
> @@ -1766,13 +1766,8 @@ static int ocfs2_mount_volume(struct super_block
*sb)
>  	}
>  
>  	status = ocfs2_truncate_log_init(osb);
> -	if (status < 0) {
> +	if (status < 0)
>  		mlog_errno(status);
> -		goto leave;
> -	}
> -
> -	if (ocfs2_mount_local(osb))
> -		goto leave;
>  
>  leave:
>  	if (unlock_super)
>

On Tue, May 19, 2009 at 06:47:20AM +0800, Tao Ma wrote:
> No need for nonsense "goto leave" in the end of
ocfs2_mount_volume.
> 
> Signed-off-by: Tao Ma <tao.ma at oracle.com>
This is now in the merge-window branch of ocfs2.git.

Joel
-- 

"Only a life lived for others is a life worth while."
							-Albert Einstein  

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