Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e5dc76b9afcfb936818261d65f6f9e1f2c346d59

Authored by Bob Peterson
Committed by Steven Whitehouse
1 parent 81e1d45061
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

GFS2: Eliminate redundant calls to may_grant 

Function add_to_queue was checking may_grant for the passed-in
holder for every iteration of its gh2 loop. Now it only checks it
once at the beginning to see if a try lock is futile.

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

Showing 1 changed file with 4 additions and 5 deletions Side-by-side Diff

... ... @@ -954,7 +954,7 @@
954 954 struct gfs2_sbd *sdp = gl->gl_sbd;
955 955 struct list_head *insert_pt = NULL;
956 956 struct gfs2_holder *gh2;
957   - int try_lock = 0;
  957 + int try_futile = 0;
958 958  
959 959 BUG_ON(gh->gh_owner_pid == NULL);
960 960 if (test_and_set_bit(HIF_WAIT, &gh->gh_iflags))
... ... @@ -962,7 +962,7 @@
962 962  
963 963 if (gh->gh_flags & (LM_FLAG_TRY | LM_FLAG_TRY_1CB)) {
964 964 if (test_bit(GLF_LOCK, &gl->gl_flags))
965   - try_lock = 1;
  965 + try_futile = !may_grant(gl, gh);
966 966 if (test_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags))
967 967 goto fail;
968 968 }
... ... @@ -971,9 +971,8 @@
971 971 if (unlikely(gh2->gh_owner_pid == gh->gh_owner_pid &&
972 972 (gh->gh_gl->gl_ops->go_type != LM_TYPE_FLOCK)))
973 973 goto trap_recursive;
974   - if (try_lock &&
975   - !(gh2->gh_flags & (LM_FLAG_TRY | LM_FLAG_TRY_1CB)) &&
976   - !may_grant(gl, gh)) {
  974 + if (try_futile &&
  975 + !(gh2->gh_flags & (LM_FLAG_TRY | LM_FLAG_TRY_1CB))) {
977 976 fail:
978 977 gh->gh_error = GLR_TRYFAILED;
979 978 gfs2_holder_wake(gh);