e1cb6be9e1
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>
37 lines
1.2 KiB
C
37 lines
1.2 KiB
C
/*
|
|
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
|
|
* Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
|
|
*
|
|
* This copyrighted material is made available to anyone wishing to use,
|
|
* modify, copy, or redistribute it subject to the terms and conditions
|
|
* of the GNU General Public License version 2.
|
|
*/
|
|
|
|
#ifndef __RECOVERY_DOT_H__
|
|
#define __RECOVERY_DOT_H__
|
|
|
|
#include "incore.h"
|
|
|
|
extern struct workqueue_struct *gfs_recovery_wq;
|
|
|
|
static inline void gfs2_replay_incr_blk(struct gfs2_jdesc *jd, unsigned int *blk)
|
|
{
|
|
if (++*blk == jd->jd_blocks)
|
|
*blk = 0;
|
|
}
|
|
|
|
extern int gfs2_replay_read_block(struct gfs2_jdesc *jd, unsigned int blk,
|
|
struct buffer_head **bh);
|
|
|
|
extern int gfs2_revoke_add(struct gfs2_jdesc *jd, u64 blkno, unsigned int where);
|
|
extern int gfs2_revoke_check(struct gfs2_jdesc *jd, u64 blkno, unsigned int where);
|
|
extern void gfs2_revoke_clean(struct gfs2_jdesc *jd);
|
|
|
|
extern int gfs2_find_jhead(struct gfs2_jdesc *jd,
|
|
struct gfs2_log_header_host *head);
|
|
extern int gfs2_recover_journal(struct gfs2_jdesc *gfs2_jd, bool wait);
|
|
extern void gfs2_recover_func(struct work_struct *work);
|
|
|
|
#endif /* __RECOVERY_DOT_H__ */
|
|
|