GFS2: Remove obsolete code in quota.c

There is no point in testing for GLF_DEMOTE here, we might as
well always release the glock at that point.

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

diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
index c609894..13f0bd2 100644 (file)
--- a/fs/gfs2/glock.h
+++ b/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/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 73a43ce..6aaa6c5 100644 (file)
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -843,9 +843,8 @@ restart:
        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 @@ restart:
                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;