Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 26caee5bc643b318fa2e9bd4f66dace1755ec413

Authored by Josef Whiter
Committed by Steven Whitehouse
1 parent 87124e581b
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[GFS2] Fix calculation of demote state 

If a glock is in the exclusive state and a request for demote to
deferred has been received, then further requests for demote to
shared are being ignored. This patch fixes that by ensuring that
we demote to unlocked in that case.

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

Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff

... ... @@ -697,8 +697,9 @@
697 697 }
698 698 return;
699 699 }
700   - } else if (gl->gl_demote_state != LM_ST_UNLOCKED) {
701   - gl->gl_demote_state = state;
  700 + } else if (gl->gl_demote_state != LM_ST_UNLOCKED &&
  701 + gl->gl_demote_state != state) {
  702 + gl->gl_demote_state = LM_ST_UNLOCKED;
702 703 }
703 704 spin_unlock(&gl->gl_spin);
704 705 }