Merge tag 'for-v3.6' of git://git.infradead.org/battery-2.6

[platform/adaptation/renesas_rcar/renesas_kernel.git] / fs / gfs2 / meta_io.c

diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index 6c1e5d1..3a56c8d 100644 (file)
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -213,8 +213,10 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,
        struct gfs2_sbd *sdp = gl->gl_sbd;
        struct buffer_head *bh;
 
-       if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
+       if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) {
+               *bhp = NULL;
                return -EIO;
+       }
 
        *bhp = bh = gfs2_getbuf(gl, blkno, CREATE);
 
@@ -235,6 +237,7 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,
                if (tr && tr->tr_touched)
                        gfs2_io_error_bh(sdp, bh);
                brelse(bh);
+               *bhp = NULL;
                return -EIO;
        }