Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

1 files changed, 2 insertions, 3 deletions

diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 910a601b2e98..f92bf1dd379a 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -784,8 +784,7 @@ int ocfs2_journal_load(struct ocfs2_journal *journal)
         }
 
         /* Launch the commit thread */
-        osb->commit_task = kthread_run(ocfs2_commit_thread, osb, "ocfs2cmt-%d",
-                                       osb->osb_id);
+        osb->commit_task = kthread_run(ocfs2_commit_thread, osb, "ocfs2cmt");
         if (IS_ERR(osb->commit_task)) {
                 status = PTR_ERR(osb->commit_task);
                 osb->commit_task = NULL;
@@ -1118,7 +1117,7 @@ void ocfs2_recovery_thread(struct ocfs2_super *osb, int node_num)
                 goto out;
 
         osb->recovery_thread_task =  kthread_run(__ocfs2_recovery_thread, osb,
-                                                 "ocfs2rec-%d", osb->osb_id);
+                                                 "ocfs2rec");
         if (IS_ERR(osb->recovery_thread_task)) {
                 mlog_errno((int)PTR_ERR(osb->recovery_thread_task));
                 osb->recovery_thread_task = NULL;