Merge tag 'gfs2-4.11.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2...

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

diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index 49db8ef13fdff5308e7e49e5765f91cb58d9ab33..663ffc135ef365a436ae658d3f71965b31cee06e 100644 (file)
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -292,7 +292,7 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,
        wait_on_buffer(bh);
        if (unlikely(!buffer_uptodate(bh))) {
                struct gfs2_trans *tr = current->journal_info;
-               if (tr && tr->tr_touched)
+               if (tr && test_bit(TR_TOUCHED, &tr->tr_flags))
                        gfs2_io_error_bh(sdp, bh);
                brelse(bh);
                *bhp = NULL;
@@ -319,7 +319,7 @@ int gfs2_meta_wait(struct gfs2_sbd *sdp, struct buffer_head *bh)
 
        if (!buffer_uptodate(bh)) {
                struct gfs2_trans *tr = current->journal_info;
-               if (tr && tr->tr_touched)
+               if (tr && test_bit(TR_TOUCHED, &tr->tr_flags))
                        gfs2_io_error_bh(sdp, bh);
                return -EIO;
        }
@@ -345,7 +345,7 @@ void gfs2_remove_from_journal(struct buffer_head *bh, int meta)
                        tr->tr_num_buf_rm++;
                else
                        tr->tr_num_databuf_rm++;
-               tr->tr_touched = 1;
+               set_bit(TR_TOUCHED, &tr->tr_flags);
                was_pinned = 1;
                brelse(bh);
        }