From 656aa88ec03ba8e8ad267e27f0c31abacc552f8b Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Thu, 16 Feb 2012 11:31:04 -0500
Subject: [PATCH] --- yaml --- r: 288039 b: refs/heads/master c:
 718b97bd6b03445be53098e3c8f896aeebc304aa h: refs/heads/master i:   288037:
 38d7effab3225140d36ff4a7a3cff112c093feef   288035:
 c59937beb04b6494d476b4abfa0598f93da0ec87   288031:
 943a79090faa46012679da13cfc7cb33460a8ffc v: v3

---
 [refs]                | 2 +-
 trunk/fs/gfs2/inode.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 553f230f10b7..af343868668d 100644
--- 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
index a7d611b93f0f..c87faf48f0a1 100644
--- 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);