diff options
| author | Fabian Frederick <fabf@skynet.be> | 2014-08-08 14:20:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 15:57:21 -0700 |
| commit | de771bdaaa9dd2585c59e1bd6cf2cac83aa0beec (patch) | |
| tree | b08856cbfb05bb5e3c0a005c37731711fac9e0e5 | |
| parent | a9814c5d2dae4b6a3052321a6cb8f2dcc0b3e30b (diff) | |
| download | lwn-de771bdaaa9dd2585c59e1bd6cf2cac83aa0beec.tar.gz lwn-de771bdaaa9dd2585c59e1bd6cf2cac83aa0beec.zip | |
fs/ufs: use pr_fmt
Replace UFS-fs, UFS-fs: and UFS: by pr_fmt with module name "ufs: "
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Evgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/ufs/super.c | 15 | ||||
| -rw-r--r-- | fs/ufs/ufs.h | 6 |
2 files changed, 13 insertions, 8 deletions
diff --git a/fs/ufs/super.c b/fs/ufs/super.c index 9778b9fb82df..cfa878e3d5e3 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c @@ -65,7 +65,6 @@ * Evgeniy Dushistov <dushistov@mail.ru>, 2007 */ - #include <linux/exportfs.h> #include <linux/module.h> #include <linux/bitops.h> @@ -310,13 +309,13 @@ void ufs_error (struct super_block * sb, const char * function, va_end (args); switch (UFS_SB(sb)->s_mount_opt & UFS_MOUNT_ONERROR) { case UFS_MOUNT_ONERROR_PANIC: - panic ("UFS-fs panic (device %s): %s: %s\n", + panic("panic (device %s): %s: %s\n", sb->s_id, function, error_buf); case UFS_MOUNT_ONERROR_LOCK: case UFS_MOUNT_ONERROR_UMOUNT: case UFS_MOUNT_ONERROR_REPAIR: - pr_crit("UFS-fs error (device %s): %s: %s\n", + pr_crit("error (device %s): %s: %s\n", sb->s_id, function, error_buf); } } @@ -340,7 +339,7 @@ void ufs_panic (struct super_block * sb, const char * function, vsnprintf (error_buf, sizeof(error_buf), fmt, args); va_end (args); sb->s_flags |= MS_RDONLY; - pr_crit("UFS-fs panic (device %s): %s: %s\n", + pr_crit("panic (device %s): %s: %s\n", sb->s_id, function, error_buf); } @@ -352,7 +351,7 @@ void ufs_warning (struct super_block * sb, const char * function, va_start (args, fmt); vsnprintf (error_buf, sizeof(error_buf), fmt, args); va_end (args); - pr_warn("UFS-fs warning (device %s): %s: %s\n", + pr_warn("warning (device %s): %s: %s\n", sb->s_id, function, error_buf); } @@ -464,12 +463,12 @@ static int ufs_parse_options (char * options, unsigned * mount_options) ufs_set_opt (*mount_options, ONERROR_UMOUNT); break; case Opt_onerror_repair: - pr_err("UFS-fs: Unable to do repair on error, will lock lock instead\n"); + pr_err("Unable to do repair on error, will lock lock instead\n"); ufs_clear_opt (*mount_options, ONERROR); ufs_set_opt (*mount_options, ONERROR_REPAIR); break; default: - pr_err("UFS-fs: Invalid option: \"%s\" or missing value\n", p); + pr_err("Invalid option: \"%s\" or missing value\n", p); return 0; } } @@ -972,7 +971,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent) again: if (!sb_set_blocksize(sb, block_size)) { - pr_err("UFS: failed to set blocksize\n"); + pr_err("failed to set blocksize\n"); goto failed; } diff --git a/fs/ufs/ufs.h b/fs/ufs/ufs.h index 343e6fc571e5..cbe1e9be9013 100644 --- a/fs/ufs/ufs.h +++ b/fs/ufs/ufs.h @@ -1,6 +1,12 @@ #ifndef _UFS_UFS_H #define _UFS_UFS_H 1 +#ifdef pr_fmt +#undef pr_fmt +#endif + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #define UFS_MAX_GROUP_LOADED 8 #define UFS_CGNO_EMPTY ((unsigned)-1) |