aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/alloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/alloc.c')
-rw-r--r--fs/ocfs2/alloc.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index f43bc5f18a35..0b2ad163005e 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -1205,10 +1205,12 @@ int ocfs2_flush_truncate_log(struct ocfs2_super *osb)
1205 return status; 1205 return status;
1206} 1206}
1207 1207
1208static void ocfs2_truncate_log_worker(void *data) 1208static void ocfs2_truncate_log_worker(struct work_struct *work)
1209{ 1209{
1210 int status; 1210 int status;
1211 struct ocfs2_super *osb = data; 1211 struct ocfs2_super *osb =
1212 container_of(work, struct ocfs2_super,
1213 osb_truncate_log_wq.work);
1212 1214
1213 mlog_entry_void(); 1215 mlog_entry_void();
1214 1216
@@ -1441,7 +1443,8 @@ int ocfs2_truncate_log_init(struct ocfs2_super *osb)
1441 /* ocfs2_truncate_log_shutdown keys on the existence of 1443 /* ocfs2_truncate_log_shutdown keys on the existence of
1442 * osb->osb_tl_inode so we don't set any of the osb variables 1444 * osb->osb_tl_inode so we don't set any of the osb variables
1443 * until we're sure all is well. */ 1445 * until we're sure all is well. */
1444 INIT_WORK(&osb->osb_truncate_log_wq, ocfs2_truncate_log_worker, osb); 1446 INIT_DELAYED_WORK(&osb->osb_truncate_log_wq,
1447 ocfs2_truncate_log_worker);
1445 osb->osb_tl_bh = tl_bh; 1448 osb->osb_tl_bh = tl_bh;
1446 osb->osb_tl_inode = tl_inode; 1449 osb->osb_tl_inode = tl_inode;
1447 1450