Merge tag 'gfs2-for-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2...

[linux-2.6-block.git] / fs / gfs2 / log.c

diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 8cddf955ebc0cca9d4de9e7577f081d8b947ac81..6ee6013fb8253679f937e7e1faa9c5aecf3e4c5a 100644 (file)
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -786,7 +786,7 @@ void gfs2_glock_remove_revoke(struct gfs2_glock *gl)
 {
        if (atomic_dec_return(&gl->gl_revokes) == 0) {
                clear_bit(GLF_LFLUSH, &gl->gl_flags);
-               gfs2_glock_queue_put(gl);
+               gfs2_glock_put_async(gl);
        }
 }
 
@@ -1108,7 +1108,8 @@ repeat:
        lops_before_commit(sdp, tr);
        if (gfs2_withdrawing_or_withdrawn(sdp))
                goto out_withdraw;
-       gfs2_log_submit_bio(&sdp->sd_jdesc->jd_log_bio, REQ_OP_WRITE);
+       if (sdp->sd_jdesc)
+               gfs2_log_submit_bio(&sdp->sd_jdesc->jd_log_bio, REQ_OP_WRITE);
        if (gfs2_withdrawing_or_withdrawn(sdp))
                goto out_withdraw;