[Cluster-devel] [GFS2 Patch] GFS2: Read in rindex if necessary during unlink

[Bob Peterson]

Hi,

This patch fixes a problem whereby you were unable to delete
files until other file system operations were done (such as
statfs, touch, writes, etc.) that caused the rindex to be
read in.

Regards,

Bob Peterson
Red Hat File Systems

Signed-off-by: Bob Peterson <rpete...@redhat.com> 
--
GFS2: Read in rindex if necessary during unlink

GFS2 was unable to delete files until the rindex file was read
in by another operation, such as statfs or a file write.
This patch adds a call to gfs2_rindex_update to gfs2_unlink.
The problem was introduced in patch 8339ee5.

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 1a84ad9..cee74c8 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -1035,14 +1035,19 @@ static int gfs2_unlink(struct inode *dir, struct dentry 
*dentry)
        struct buffer_head *bh;
        struct gfs2_holder ghs[3];
        struct gfs2_rgrpd *rgd;
-       int error = -EROFS;
+       int error;
 
+       error = gfs2_rindex_update(sdp);
+       if (error)
+               return error;
        gfs2_holder_init(dip->i_gl, LM_ST_EXCLUSIVE, 0, ghs);
        gfs2_holder_init(ip->i_gl,  LM_ST_EXCLUSIVE, 0, ghs + 1);
 
        rgd = gfs2_blk2rgrpd(sdp, ip->i_no_addr, 1);
-       if (!rgd)
+       if (!rgd) {
+               error = -EROFS;
                goto out_inodes;
+       }
        gfs2_holder_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, ghs + 2);