---

yaml --- r: 169189 b: refs/heads/master c: 91094d0 h: refs/heads/master i: 169187: 1daeb44 v: v3
git-mirror · Dec 3, 2009 · 3f875ac · 3f875ac
1 parent 57df678
commit 3f875ac
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc632e7f93465597896862cf9e50baefb1999215
+refs/heads/master: 91094d0fb650decd8bf48b85d86c892d7ca913ee
diff --git a/trunk/fs/gfs2/glock.h b/trunk/fs/gfs2/glock.h
@@ -180,15 +180,6 @@ static inline int gfs2_glock_is_held_shrd(struct gfs2_glock *gl)
 	return gl->gl_state == LM_ST_SHARED;
 }
 
-static inline int gfs2_glock_is_blocking(struct gfs2_glock *gl)
-{
-	int ret;
-	spin_lock(&gl->gl_spin);
-	ret = test_bit(GLF_DEMOTE, &gl->gl_flags);
-	spin_unlock(&gl->gl_spin);
-	return ret;
-}
-
 int gfs2_glock_get(struct gfs2_sbd *sdp,
 		   u64 number, const struct gfs2_glock_operations *glops,
 		   int create, struct gfs2_glock **glp);

diff --git a/trunk/fs/gfs2/quota.c b/trunk/fs/gfs2/quota.c
@@ -843,9 +843,8 @@ static int do_glock(struct gfs2_quota_data *qd, int force_refresh,
 	if (force_refresh || qd->qd_qb.qb_magic != cpu_to_be32(GFS2_MAGIC)) {
 		loff_t pos;
 		gfs2_glock_dq_uninit(q_gh);
-		error = gfs2_glock_nq_init(qd->qd_gl,
-					   LM_ST_EXCLUSIVE, GL_NOCACHE,
-					   q_gh);
+		error = gfs2_glock_nq_init(qd->qd_gl, LM_ST_EXCLUSIVE,
+					   GL_NOCACHE, q_gh);
 		if (error)
 			return error;
 
@@ -871,11 +870,9 @@ static int do_glock(struct gfs2_quota_data *qd, int force_refresh,
 		qlvb->qb_value = cpu_to_be64(q.qu_value);
 		qd->qd_qb = *qlvb;
 
-		if (gfs2_glock_is_blocking(qd->qd_gl)) {
-			gfs2_glock_dq_uninit(q_gh);
-			force_refresh = 0;
-			goto restart;
-		}
+		gfs2_glock_dq_uninit(q_gh);
+		force_refresh = 0;
+		goto restart;
 	}
 
 	return 0;