[GFS2] Tidy up in various files

Tidy up some files and remove an unused routine in meta_io.h. Also
added a bit of extra debugging in meta_io.h.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index d13e04e8a96..145a29fa4ea 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -597,13 +597,11 @@ static int gfs2_open(struct inode *inode, struct file *file)
 
 	return 0;
 
- fail_gunlock:
+fail_gunlock:
 	gfs2_glock_dq_uninit(&i_gh);
-
- fail:
+fail:
 	file->private_data = NULL;
 	kfree(fp);
-
 	return error;
 }
 
@@ -736,9 +734,8 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl)
 		gfs2_assert_warn(GFS2_SB(&ip->i_inode), !error);
 	}
 
- out:
+out:
 	mutex_unlock(&fp->f_fl_mutex);
-
 	return error;
 }