Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 02ffad08e838997fad3de05c85560a57e5fd92de

Authored by Benjamin Marzinski
Committed by Steven Whitehouse
1 parent 229615def3
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

GFS2: Fix locking bug in failed shared to exclusive conversion 

After calling out to the dlm, GFS2 sets the new state of a glock to
gl_target in gdlm_ast().  However, gl_target is not always the lock
state that was requested. If a conversion from shared to exclusive
fails, finish_xmote() will call do_xmote() with LM_ST_UNLOCKED, instead
of gl->gl_target, so that it can reacquire the lock in exlusive the next
time around.  In this case, setting the lock to gl_target in gdlm_ast()
will make GFS2 think that it has the glock in exclusive mode, when
really, it doesn't have the glock locked at all.  This patch adds a new
field to the gfs2_glock structure, gl_req, to track the mode that was
requested.

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

Showing 2 changed files with 5 additions and 3 deletions Side-by-side Diff

... ... @@ -203,6 +203,7 @@
203 203 unsigned int gl_target;
204 204 unsigned int gl_reply;
205 205 unsigned int gl_hash;
  206 + unsigned int gl_req;
206 207 unsigned int gl_demote_state; /* state requested by remote node */
207 208 unsigned long gl_demote_time; /* time of first demote request */
208 209 struct list_head gl_holders;
... ... @@ -46,11 +46,11 @@
46 46 BUG();
47 47 }
48 48  
49   - ret = gl->gl_target;
  49 + ret = gl->gl_req;
50 50 if (gl->gl_lksb.sb_flags & DLM_SBF_ALTMODE) {
51   - if (gl->gl_target == LM_ST_SHARED)
  51 + if (gl->gl_req == LM_ST_SHARED)
52 52 ret = LM_ST_DEFERRED;
53   - else if (gl->gl_target == LM_ST_DEFERRED)
  53 + else if (gl->gl_req == LM_ST_DEFERRED)
54 54 ret = LM_ST_SHARED;
55 55 else
56 56 BUG();
... ... @@ -147,6 +147,7 @@
147 147 int req;
148 148 u32 lkf;
149 149  
  150 + gl->gl_req = req_state;
150 151 req = make_mode(req_state);
151 152 lkf = make_flags(gl->gl_lksb.sb_lkid, flags, req);
152 153