[GFS2] Reordering in deallocation to avoid recursive locking

Despite my earlier careful search, there was a recursive lock left
in the deallocation code. This removes it. It also should speed up
deallocation be reducing the number of locking operations which take
place by using two "try lock" operations on the two locks involved in
inode deallocation which allows us to grab the locks out of order
(compared with NFS which grabs the inode lock first and the iopen
lock later). It is ok for us to fail while doing this since if it
does fail it means that someone else is still using the inode and
thus it wouldn't be possible to deallocate anyway.

This fixes the bug reported to me by Rob Kenna.

Cc: Rob Kenna <rkenna@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 17d474fab5ab..f82ecc0cc8fb 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -1814,7 +1814,7 @@ void gfs2_try_toss_inode(struct gfs2_sbd *sdp, struct gfs2_inum *inum)
         if (atomic_read(&ip->i_count))
                 goto out_unlock;
 
-        gfs2_inode_destroy(ip);
+        gfs2_inode_destroy(ip, 1);
 
  out_unlock:
         gfs2_glmutex_unlock(gl);
@@ -1940,7 +1940,7 @@ void gfs2_reclaim_glock(struct gfs2_sbd *sdp)
                 if (gl->gl_ops == &gfs2_inode_glops) {
                         struct gfs2_inode *ip = gl->gl_object;
                         if (ip && !atomic_read(&ip->i_count))
-                                gfs2_inode_destroy(ip);
+                                gfs2_inode_destroy(ip, 1);
                 }
                 if (queue_empty(gl, &gl->gl_holders) &&
                     gl->gl_state != LM_ST_UNLOCKED &&
@@ -2083,7 +2083,7 @@ static void clear_glock(struct gfs2_glock *gl)
                 if (gl->gl_ops == &gfs2_inode_glops) {
                         struct gfs2_inode *ip = gl->gl_object;
                         if (ip && !atomic_read(&ip->i_count))
-                                gfs2_inode_destroy(ip);
+                                gfs2_inode_destroy(ip, 1);
                 }
                 if (queue_empty(gl, &gl->gl_holders) &&
                     gl->gl_state != LM_ST_UNLOCKED)