diff options
Diffstat (limited to 'fs/ubifs/commit.c')
-rw-r--r-- | fs/ubifs/commit.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c index 26b69b2d4a45..63f56619991d 100644 --- a/fs/ubifs/commit.c +++ b/fs/ubifs/commit.c | |||
@@ -225,7 +225,7 @@ out_cancel: | |||
225 | out_up: | 225 | out_up: |
226 | up_write(&c->commit_sem); | 226 | up_write(&c->commit_sem); |
227 | out: | 227 | out: |
228 | ubifs_err("commit failed, error %d", err); | 228 | ubifs_err(c, "commit failed, error %d", err); |
229 | spin_lock(&c->cs_lock); | 229 | spin_lock(&c->cs_lock); |
230 | c->cmt_state = COMMIT_BROKEN; | 230 | c->cmt_state = COMMIT_BROKEN; |
231 | wake_up(&c->cmt_wq); | 231 | wake_up(&c->cmt_wq); |
@@ -289,7 +289,7 @@ int ubifs_bg_thread(void *info) | |||
289 | int err; | 289 | int err; |
290 | struct ubifs_info *c = info; | 290 | struct ubifs_info *c = info; |
291 | 291 | ||
292 | ubifs_msg("background thread \"%s\" started, PID %d", | 292 | ubifs_msg(c, "background thread \"%s\" started, PID %d", |
293 | c->bgt_name, current->pid); | 293 | c->bgt_name, current->pid); |
294 | set_freezable(); | 294 | set_freezable(); |
295 | 295 | ||
@@ -324,7 +324,7 @@ int ubifs_bg_thread(void *info) | |||
324 | cond_resched(); | 324 | cond_resched(); |
325 | } | 325 | } |
326 | 326 | ||
327 | ubifs_msg("background thread \"%s\" stops", c->bgt_name); | 327 | ubifs_msg(c, "background thread \"%s\" stops", c->bgt_name); |
328 | return 0; | 328 | return 0; |
329 | } | 329 | } |
330 | 330 | ||
@@ -712,13 +712,13 @@ out: | |||
712 | return 0; | 712 | return 0; |
713 | 713 | ||
714 | out_dump: | 714 | out_dump: |
715 | ubifs_err("dumping index node (iip=%d)", i->iip); | 715 | ubifs_err(c, "dumping index node (iip=%d)", i->iip); |
716 | ubifs_dump_node(c, idx); | 716 | ubifs_dump_node(c, idx); |
717 | list_del(&i->list); | 717 | list_del(&i->list); |
718 | kfree(i); | 718 | kfree(i); |
719 | if (!list_empty(&list)) { | 719 | if (!list_empty(&list)) { |
720 | i = list_entry(list.prev, struct idx_node, list); | 720 | i = list_entry(list.prev, struct idx_node, list); |
721 | ubifs_err("dumping parent index node"); | 721 | ubifs_err(c, "dumping parent index node"); |
722 | ubifs_dump_node(c, &i->idx); | 722 | ubifs_dump_node(c, &i->idx); |
723 | } | 723 | } |
724 | out_free: | 724 | out_free: |
@@ -727,7 +727,7 @@ out_free: | |||
727 | list_del(&i->list); | 727 | list_del(&i->list); |
728 | kfree(i); | 728 | kfree(i); |
729 | } | 729 | } |
730 | ubifs_err("failed, error %d", err); | 730 | ubifs_err(c, "failed, error %d", err); |
731 | if (err > 0) | 731 | if (err > 0) |
732 | err = -EINVAL; | 732 | err = -EINVAL; |
733 | return err; | 733 | return err; |