diff options
| author | Mike Marshall <hubcap@omnibond.com> | 2016-03-14 15:39:42 -0400 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2016-03-14 15:39:42 -0400 |
| commit | ab6652524aaf834d5dcdb46dd7695813b8d63da5 (patch) | |
| tree | bb3876a9b61254be902416f7dbf578deb28e9f22 /fs/gfs2/log.c | |
| parent | acfcbaf1925f2dc5c46c61de69d756dec92a2ff8 (diff) | |
| parent | b562e44f507e863c6792946e4e1b1449fbbac85d (diff) | |
| download | op-kernel-dev-ab6652524aaf834d5dcdb46dd7695813b8d63da5.zip op-kernel-dev-ab6652524aaf834d5dcdb46dd7695813b8d63da5.tar.gz | |
Orangefs: merge to v4.5
Merge tag 'v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into current
Linux 4.5
Diffstat (limited to 'fs/gfs2/log.c')
| -rw-r--r-- | fs/gfs2/log.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index 536e7a6..0ff028c 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c @@ -716,6 +716,9 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, } trace_gfs2_log_flush(sdp, 1); + if (type == SHUTDOWN_FLUSH) + clear_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags); + sdp->sd_log_flush_head = sdp->sd_log_head; sdp->sd_log_flush_wrapped = 0; tr = sdp->sd_log_tr; |
