author: David Teigland <teigland@redhat.com> 2012-01-09 15:29:20 -0500
committer: Steven Whitehouse <swhiteho@redhat.com> 2012-01-11 09:24:48 +0000
commit: 376d37788b56bc2800e5bd56b7a36b3544d89f97
parent: e8ca5cc571a60339491f8c273a01093096ff8704
Commit Summary:
Diffstat:
1 file changed, 2 insertions, 1 deletion
diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
index 80701d1566a1..963b2d75200c 100644
--- a/fs/gfs2/recovery.c
+++ b/fs/gfs2/recovery.c
@@ -583,6 +583,7 @@ fail_gunlock_j:
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;
}