Commit 36dfd116 authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files

fs/fscache: convert printk to pr_foo() 



All printk converted to pr_foo() except internal.h: printk(KERN_DEBUG

Coalesce formats.

Add pr_fmt

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8fe6929c

fs/fscache/cache.c

+6 −7
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ int fscache_add_cache(struct fscache_cache *cache, 
	spin_unlock(&fscache_fsdef_index.lock);

	up_write(&fscache_addremove_sem);



	printk(KERN_NOTICE "FS-Cache: Cache \"%s\" added (type %s)\n",

	pr_notice("Cache \"%s\" added (type %s)\n",

		  cache->tag->name, cache->ops->name);

	kobject_uevent(cache->kobj, KOBJ_ADD);
@@ -288,7 +288,7 @@ int fscache_add_cache(struct fscache_cache *cache, 
	return 0;



tag_in_use:

	printk(KERN_ERR "FS-Cache: Cache tag '%s' already in use\n", tagname);

	pr_err("Cache tag '%s' already in use\n", tagname);

	__fscache_release_cache_tag(tag);

	_leave(" = -EXIST");

	return -EEXIST;
@@ -317,8 +317,7 @@ EXPORT_SYMBOL(fscache_add_cache); 
void fscache_io_error(struct fscache_cache *cache)

{

	if (!test_and_set_bit(FSCACHE_IOERROR, &cache->flags))

		printk(KERN_ERR "FS-Cache:"

		       " Cache '%s' stopped due to I/O error\n",

		pr_err("Cache '%s' stopped due to I/O error\n",

		       cache->ops->name);

}

EXPORT_SYMBOL(fscache_io_error);
@@ -369,7 +368,7 @@ void fscache_withdraw_cache(struct fscache_cache *cache) 


	_enter("");



	printk(KERN_NOTICE "FS-Cache: Withdrawing cache \"%s\"\n",

	pr_notice("Withdrawing cache \"%s\"\n",

		  cache->tag->name);



	/* make the cache unavailable for cookie acquisition */

fs/fscache/cookie.c

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ void __fscache_disable_cookie(struct fscache_cookie *cookie, bool invalidate) 
	ASSERTCMP(atomic_read(&cookie->n_active), >, 0);



	if (atomic_read(&cookie->n_children) != 0) {

		printk(KERN_ERR "FS-Cache: Cookie '%s' still has children\n",

		pr_err("Cookie '%s' still has children\n",

		       cookie->def->name);

		BUG();

	}

fs/fscache/internal.h

+16 −10
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ 
 *

 */



#ifdef pr_fmt

#undef pr_fmt

#endif



#define pr_fmt(fmt) "FS-Cache: " fmt



#include <linux/fscache-cache.h>

#include <linux/sched.h>
@@ -413,8 +419,8 @@ do { \ 
#define ASSERT(X)							\

do {									\

	if (unlikely(!(X))) {						\

		printk(KERN_ERR "\n");					\

		printk(KERN_ERR "FS-Cache: Assertion failed\n");	\

		pr_err("\n");					\

		pr_err("Assertion failed\n");	\

		BUG();							\

	}								\

} while (0)
@@ -422,9 +428,9 @@ do { \ 
#define ASSERTCMP(X, OP, Y)						\

do {									\

	if (unlikely(!((X) OP (Y)))) {					\

		printk(KERN_ERR "\n");					\

		printk(KERN_ERR "FS-Cache: Assertion failed\n");	\

		printk(KERN_ERR "%lx " #OP " %lx is false\n",		\

		pr_err("\n");					\

		pr_err("Assertion failed\n");	\

		pr_err("%lx " #OP " %lx is false\n",		\

		       (unsigned long)(X), (unsigned long)(Y));		\

		BUG();							\

	}								\
@@ -433,8 +439,8 @@ do { \ 
#define ASSERTIF(C, X)							\

do {									\

	if (unlikely((C) && !(X))) {					\

		printk(KERN_ERR "\n");					\

		printk(KERN_ERR "FS-Cache: Assertion failed\n");	\

		pr_err("\n");					\

		pr_err("Assertion failed\n");	\

		BUG();							\

	}								\

} while (0)
@@ -442,9 +448,9 @@ do { \ 
#define ASSERTIFCMP(C, X, OP, Y)					\

do {									\

	if (unlikely((C) && !((X) OP (Y)))) {				\

		printk(KERN_ERR "\n");					\

		printk(KERN_ERR "FS-Cache: Assertion failed\n");	\

		printk(KERN_ERR "%lx " #OP " %lx is false\n",		\

		pr_err("\n");					\

		pr_err("Assertion failed\n");	\

		pr_err("%lx " #OP " %lx is false\n",		\

		       (unsigned long)(X), (unsigned long)(Y));		\

		BUG();							\

	}								\

fs/fscache/main.c

+3 −4
Original line number Diff line number Diff line
@@ -146,8 +146,7 @@ static int __init fscache_init(void) 
					       0,

					       fscache_cookie_init_once);

	if (!fscache_cookie_jar) {

		printk(KERN_NOTICE

		       "FS-Cache: Failed to allocate a cookie jar\n");

		pr_notice("Failed to allocate a cookie jar\n");

		ret = -ENOMEM;

		goto error_cookie_jar;

	}
@@ -156,7 +155,7 @@ static int __init fscache_init(void) 
	if (!fscache_root)

		goto error_kobj;



	printk(KERN_NOTICE "FS-Cache: Loaded\n");

	pr_notice("Loaded\n");

	return 0;



error_kobj:
@@ -192,7 +191,7 @@ static void __exit fscache_exit(void) 
	fscache_proc_cleanup();

	destroy_workqueue(fscache_op_wq);

	destroy_workqueue(fscache_object_wq);

	printk(KERN_NOTICE "FS-Cache: Unloaded\n");

	pr_notice("Unloaded\n");

}



module_exit(fscache_exit);

fs/fscache/netfs.c

+3 −4
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ int __fscache_register_netfs(struct fscache_netfs *netfs) 
	list_add(&netfs->link, &fscache_netfs_list);

	ret = 0;



	printk(KERN_NOTICE "FS-Cache: Netfs '%s' registered for caching\n",

	       netfs->name);

	pr_notice("Netfs '%s' registered for caching\n", netfs->name);



already_registered:

	up_write(&fscache_addremove_sem);
@@ -97,7 +96,7 @@ void __fscache_unregister_netfs(struct fscache_netfs *netfs) 


	up_write(&fscache_addremove_sem);



	printk(KERN_NOTICE "FS-Cache: Netfs '%s' unregistered from caching\n",

	pr_notice("Netfs '%s' unregistered from caching\n",

		  netfs->name);



	_leave("");