Skip to contentSkip to conversation

ocfs2/trivial: Code cleanup of ocfs2_mount_volume.

PATCH New Tao Ma 3 participants 3 messages May 18, 2009 – Jun 4, 2009 OCFS2

lore
Share & tools
lore

Tao Ma

author
#0 lore raw

PATCH 1/1 ocfs2/trivial: Code cleanup of ocfs2_mount_volume.

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

---
 fs/ocfs2/super.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
fs/ocfs2/super.c +1 -6
index 79ff8d9..4601a57 100644
@@ -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)
Signature · 1 line
1.6.1.40.g8ea6a
#1 lore raw

PATCH 1/1 ocfs2/trivial: Code cleanup of ocfs2_mount_volume.

Quoted 4 lines · Tao Ma

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

Remove redundant gotos in ocfs2_mount_volume().

Quoted 24 lines
---
 fs/ocfs2/super.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
fs/ocfs2/super.c +1 -6
index 79ff8d9..4601a57 100644
@@ -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)
#2 lore raw

PATCH 1/1 ocfs2/trivial: Code cleanup of ocfs2_mount_volume.

In reply to Tao Ma
Quoted 3 lines · Tao Ma

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

This is now in the merge-window branch of ocfs2.git.

Joel

Signature · 8 lines
"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