---

yaml --- r: 288039 b: refs/heads/master c: 718b97b h: refs/heads/master i: 288037: 38d7eff 288035: c59937b 288031: 943a790 v: v3
git-mirror · Feb 28, 2012 · 656aa88 · 656aa88
1 parent 0890c4e
commit 656aa88
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4043b886b0740ded65f633fc4b7225d624c7e658
+refs/heads/master: 718b97bd6b03445be53098e3c8f896aeebc304aa
diff --git a/trunk/fs/gfs2/inode.c b/trunk/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);
-	if (!rgd)
+	if (!rgd) {
+		error = -EROFS;
 		goto out_inodes;
+	}
 	gfs2_holder_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, ghs + 2);