[GFS2] Fixes to scanning of glocks (again)

This really is the correct fix this time. We just ignore all
glocks associated with inodes until the inodes are pushed
from the inode cache. At that point the glocks are queued for
reclaim, so we don't need to do it here.

Also fix one or two other minor bugs.

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

1 files changed, 2 insertions, 0 deletions

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 6499c4f91078..f4c48395208a 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -325,6 +325,7 @@ int gfs2_change_nlink(struct gfs2_inode *ip, int diff)
         uint32_t nlink;
         int error;
 
+        BUG_ON(ip->i_di.di_nlink != ip->i_inode.i_nlink);
         nlink = ip->i_di.di_nlink + diff;
 
         /* If we are reducing the nlink count, but the new value ends up being
@@ -341,6 +342,7 @@ int gfs2_change_nlink(struct gfs2_inode *ip, int diff)
 
         ip->i_di.di_nlink = nlink;
         ip->i_di.di_ctime = get_seconds();
+        ip->i_inode.i_nlink = nlink;
 
         gfs2_trans_add_bh(ip->i_gl, dibh, 1);
         gfs2_dinode_out(&ip->i_di, dibh->b_data);