leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GFS2: Prevent recovery before the local journal is set

Browse Source 
This patch uses a completion to prevent dlm's recovery process from
referencing and trying to recover a journal before a journal has been
opened.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Bob Peterson 2014-06-02 09:40:25 -04:00 committed by Steven Whitehouse
parent 9dd868e1c0
commit 0e48e055a7
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/gfs2/incore.h
View File

@ -728,6 +728,8 @@ struct gfs2_sbd {
struct gfs2_holder sd_sc_gh; struct gfs2_holder sd_sc_gh;
struct gfs2_holder sd_qc_gh; struct gfs2_holder sd_qc_gh;
struct completion sd_journal_ready;
/* Daemon stuff */ /* Daemon stuff */
struct task_struct *sd_logd_process; struct task_struct *sd_logd_process;

3
fs/gfs2/ops_fstype.c
View File

@ -94,6 +94,7 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb)
INIT_LIST_HEAD(&sdp->sd_jindex_list); INIT_LIST_HEAD(&sdp->sd_jindex_list);
spin_lock_init(&sdp->sd_jindex_spin); spin_lock_init(&sdp->sd_jindex_spin);
mutex_init(&sdp->sd_jindex_mutex); mutex_init(&sdp->sd_jindex_mutex);
init_completion(&sdp->sd_journal_ready);
INIT_LIST_HEAD(&sdp->sd_quota_list); INIT_LIST_HEAD(&sdp->sd_quota_list);
mutex_init(&sdp->sd_quota_mutex); mutex_init(&sdp->sd_quota_mutex);
@ -796,6 +797,7 @@ static int init_inodes(struct gfs2_sbd *sdp, int undo)
goto fail_qinode; goto fail_qinode;
error = init_journal(sdp, undo); error = init_journal(sdp, undo);
complete_all(&sdp->sd_journal_ready);
if (error) if (error)
goto fail; goto fail;
@ -1212,6 +1214,7 @@ fail_sb:
fail_locking: fail_locking:
init_locking(sdp, &mount_gh, UNDO); init_locking(sdp, &mount_gh, UNDO);
fail_lm: fail_lm:
complete_all(&sdp->sd_journal_ready);
gfs2_gl_hash_clear(sdp); gfs2_gl_hash_clear(sdp);
gfs2_lm_unmount(sdp); gfs2_lm_unmount(sdp);
fail_debug: fail_debug:

3
fs/gfs2/sys.c
View File

@ -407,6 +407,9 @@ int gfs2_recover_set(struct gfs2_sbd *sdp, unsigned jid)
struct gfs2_jdesc *jd; struct gfs2_jdesc *jd;
int rv; int rv;
/* Wait for our primary journal to be initialized */
wait_for_completion(&sdp->sd_journal_ready);
spin_lock(&sdp->sd_jindex_spin); spin_lock(&sdp->sd_jindex_spin);
rv = -EBUSY; rv = -EBUSY;
if (sdp->sd_jdesc->jd_jid == jid) if (sdp->sd_jdesc->jd_jid == jid)