diff options
| author |   Bob Peterson <rpeterso@redhat.com> | 2016-07-21 13:02:44 -0500 |
|---|---|---|
| committer | Bob Peterson <rpeterso@redhat.com> | 2016-07-21 13:02:44 -0500 |
| commit | e1cb6be9e142e6cc6246f3ab2776b4d7a2b3d9f0 (patch) | |
| tree | 356136ccb12a6175568718e01a1a5b2628fa649c /fs/gfs2/recovery.h | |
| parent | GFS2: Check rs_free with rd_rsspin protection (diff) | |
| download | linux-dev-e1cb6be9e142e6cc6246f3ab2776b4d7a2b3d9f0.tar.xz linux-dev-e1cb6be9e142e6cc6246f3ab2776b4d7a2b3d9f0.zip | |
GFS2: Fix gfs2_replay_incr_blk for multiple journal sizes
Before this patch, if you used gfs2_jadd to add new journals of a
size smaller than the existing journals, replaying those new journals
would withdraw. That's because function gfs2_replay_incr_blk was
using the number of journal blocks (jd_block) from the superblock's
journal pointer. In other words, "My journal's max size" rather than
"the journal we're replaying's size." This patch changes the function
to use the size of the pertinent journal rather than always using the
journal we happen to be using.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'fs/gfs2/recovery.h')
| -rw-r--r-- | fs/gfs2/recovery.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/recovery.h b/fs/gfs2/recovery.h index 6142836cce96..11fdfab4bf99 100644 --- a/fs/gfs2/recovery.h +++ b/fs/gfs2/recovery.h @@ -14,9 +14,9 @@ extern struct workqueue_struct *gfs_recovery_wq; -static inline void gfs2_replay_incr_blk(struct gfs2_sbd *sdp, unsigned int *blk) +static inline void gfs2_replay_incr_blk(struct gfs2_jdesc *jd, unsigned int *blk) { - if (++*blk == sdp->sd_jdesc->jd_blocks) + if (++*blk == jd->jd_blocks) *blk = 0; } |