Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 376d3778 authored by David Teigland's avatar David Teigland Committed by Steven Whitehouse
Browse files

GFS2: fail mount if journal recovery fails 



If the first mounter fails to recover one of the journals
during mount, the mount should fail.

Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent e8ca5cc5

fs/gfs2/incore.h

+1 −0
Original line number Diff line number Diff line
@@ -429,6 +429,7 @@ struct gfs2_jdesc { 
#define JDF_RECOVERY 1

	unsigned int jd_jid;

	unsigned int jd_blocks;

	int jd_recover_error;

};



struct gfs2_statfs_change_host {

fs/gfs2/recovery.c

+2 −1
Original line number Diff line number Diff line
@@ -583,6 +583,7 @@ void gfs2_recover_func(struct work_struct *work) 


	fs_info(sdp, "jid=%u: %s\n", jd->jd_jid, (error) ? "Failed" : "Done");

fail:

	jd->jd_recover_error = error;

	gfs2_recovery_done(sdp, jd->jd_jid, LM_RD_GAVEUP);

done:

	clear_bit(JDF_RECOVERY, &jd->jd_flags);
@@ -611,6 +612,6 @@ int gfs2_recover_journal(struct gfs2_jdesc *jd, bool wait) 
		wait_on_bit(&jd->jd_flags, JDF_RECOVERY, gfs2_recovery_wait,

			    TASK_UNINTERRUPTIBLE);



	return 0;

	return wait ? jd->jd_recover_error : 0;

}