[GFS2] Drop log lock on I/O error & tidy up

This patch drops the log spinlock when an I/O error occurs
to avoid any possible problems in case of blocking or
recursion in the I/O error routine. It also has a few
cosmetic changes to tidy up various other files.

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

1 files changed, 2 insertions, 3 deletions

diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index 62a12a59d91b..b25ec4c8e56a 100644
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -213,8 +213,7 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
                 if (error)
                         goto out_gunlock_q;
 
-                error = gfs2_trans_begin(sdp,
-                                         sdp->sd_max_dirres +
+                error = gfs2_trans_begin(sdp, sdp->sd_max_dirres +
                                          al->al_rgd->rd_ri.ri_length +
                                          2 * RES_DINODE + RES_STATFS +
                                          RES_QUOTA, 0);
@@ -303,7 +302,7 @@ static int gfs2_unlink(struct inode *dir, struct dentry *dentry)
         if (error)
                 goto out_gunlock;
 
-        error = gfs2_unlinki(dip, &dentry->d_name, ip,ul);
+        error = gfs2_unlinki(dip, &dentry->d_name, ip, ul);
 
         gfs2_trans_end(sdp);