X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=fs%2Focfs2%2Fjournal.c;h=d95ee2720e6eebd92bb0e6daa1c2eebefc03375a;hb=c4028958b6ecad064b1a6303a6a5906d4fe48d73;hp=fd9734def551a8da3d82745f565b8ed1f084cced;hpb=65f27f38446e1976cc98fd3004b110fedcddd189;p=deliverable%2Flinux.git

diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index fd9734def551..d95ee2720e6e 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -911,11 +911,12 @@ struct ocfs2_la_recovery_item {
  * NOTE: This function can and will sleep on recovery of other nodes
  * during cluster locking, just like any other ocfs2 process.
  */
-void ocfs2_complete_recovery(void *data)
+void ocfs2_complete_recovery(struct work_struct *work)
 {
 	int ret;
-	struct ocfs2_super *osb = data;
-	struct ocfs2_journal *journal = osb->journal;
+	struct ocfs2_journal *journal =
+		container_of(work, struct ocfs2_journal, j_recovery_work);
+	struct ocfs2_super *osb = journal->j_osb;
 	struct ocfs2_dinode *la_dinode, *tl_dinode;
 	struct ocfs2_la_recovery_item *item;
 	struct list_head *p, *n;