lkml.org 
[lkml]   [2008]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/58] [GFS2] Remove flags no longer required
    Date
    From: Steven Whitehouse <swhiteho@redhat.com>

    The HIF_MUTEX and HIF_PROMOTE flags were set on the glock holders
    depending upon which of the two waiters lists they were going to
    be queued upon. They were then tested when the holders were taken
    off the lists to ensure that the right type of holder was being
    dequeued.

    Since we are already using separate lists, there doesn't seem a
    lot of point having these flags as well, and since setting them
    and testing them is in the fast path for locking and unlocking
    glock, this patch removes them.

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

    diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
    index e668808..5fbd9d3 100644
    --- a/fs/gfs2/glock.c
    +++ b/fs/gfs2/glock.c
    @@ -594,12 +594,7 @@ static void run_queue(struct gfs2_glock *gl)
    if (!list_empty(&gl->gl_waiters1)) {
    gh = list_entry(gl->gl_waiters1.next,
    struct gfs2_holder, gh_list);
    -
    - if (test_bit(HIF_MUTEX, &gh->gh_iflags))
    - blocked = rq_mutex(gh);
    - else
    - gfs2_assert_warn(gl->gl_sbd, 0);
    -
    + blocked = rq_mutex(gh);
    } else if (test_bit(GLF_DEMOTE, &gl->gl_flags)) {
    blocked = rq_demote(gl);
    if (gl->gl_waiters2 && !blocked) {
    @@ -610,12 +605,7 @@ static void run_queue(struct gfs2_glock *gl)
    } else if (!list_empty(&gl->gl_waiters3)) {
    gh = list_entry(gl->gl_waiters3.next,
    struct gfs2_holder, gh_list);
    -
    - if (test_bit(HIF_PROMOTE, &gh->gh_iflags))
    - blocked = rq_promote(gh);
    - else
    - gfs2_assert_warn(gl->gl_sbd, 0);
    -
    + blocked = rq_promote(gh);
    } else
    break;

    @@ -636,7 +626,6 @@ static void gfs2_glmutex_lock(struct gfs2_glock *gl)
    struct gfs2_holder gh;

    gfs2_holder_init(gl, 0, 0, &gh);
    - set_bit(HIF_MUTEX, &gh.gh_iflags);
    if (test_and_set_bit(HIF_WAIT, &gh.gh_iflags))
    BUG();

    @@ -1160,8 +1149,6 @@ restart:
    return -EIO;
    }

    - set_bit(HIF_PROMOTE, &gh->gh_iflags);
    -
    spin_lock(&gl->gl_spin);
    add_to_queue(gh);
    run_queue(gl);
    diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
    index 089dba4..478023e 100644
    --- a/fs/gfs2/incore.h
    +++ b/fs/gfs2/incore.h
    @@ -141,10 +141,6 @@ struct gfs2_glock_operations {
    };

    enum {
    - /* Actions */
    - HIF_MUTEX = 0,
    - HIF_PROMOTE = 1,
    -
    /* States */
    HIF_HOLDER = 6,
    HIF_FIRST = 7,
    --
    1.5.1.2


    \
     
     \ /
      Last update: 2008-01-21 11:11    [W:3.135 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site