Merge branch 'for-4.6-ns' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
[linux-2.6-block.git] / mm / backing-dev.c
index 926c76d56388d12ea723b68add1e5b7ab6613842..bfbd7096b6edc3c5e87398e93507cb124661b3ab 100644 (file)
@@ -328,7 +328,7 @@ static int wb_init(struct bdi_writeback *wb, struct backing_dev_info *bdi,
        return 0;
 
 out_destroy_stat:
-       while (--i)
+       while (i--)
                percpu_counter_destroy(&wb->stat[i]);
        fprop_local_destroy_percpu(&wb->completions);
 out_put_cong:
@@ -1026,8 +1026,8 @@ int pdflush_proc_obsolete(struct ctl_table *table, int write,
 
        if (copy_to_user(buffer, kbuf, sizeof(kbuf)))
                return -EFAULT;
-       printk_once(KERN_WARNING "%s exported in /proc is scheduled for removal\n",
-                       table->procname);
+       pr_warn_once("%s exported in /proc is scheduled for removal\n",
+                    table->procname);
 
        *lenp = 2;
        *ppos += *lenp;