diff options
author | Joe Perches <joe@perches.com> | 2011-10-10 04:08:05 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2011-10-31 18:43:52 -0400 |
commit | 78ace70c4186c0d18314eb001637aa97d1585e65 (patch) | |
tree | 34227a6d50b93eb66df22ba130bea8ed932a5896 /fs/udf/directory.c | |
parent | a40ecd7b3ccf520ff02da93e8d1ba6cd55c2e359 (diff) |
udf: Convert printks to pr_<level>
Use the current logging styles.
Convert a few printks that should have been udf_warn and udf_err.
Coalesce formats. Add #define pr_fmt.
Move an #include "udfdecls.h" above other includes in udftime.c
so pr_fmt works correctly. Strip prefixes from conversions as appropriate.
Reorder logging definitions in udfdecl.h
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/directory.c')
-rw-r--r-- | fs/udf/directory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/udf/directory.c b/fs/udf/directory.c index 2ffdb6733af1..4e0843897d07 100644 --- a/fs/udf/directory.c +++ b/fs/udf/directory.c | |||
@@ -201,7 +201,7 @@ struct short_ad *udf_get_fileshortad(uint8_t *ptr, int maxoffset, uint32_t *offs | |||
201 | struct short_ad *sa; | 201 | struct short_ad *sa; |
202 | 202 | ||
203 | if ((!ptr) || (!offset)) { | 203 | if ((!ptr) || (!offset)) { |
204 | printk(KERN_ERR "udf: udf_get_fileshortad() invalidparms\n"); | 204 | pr_err("%s: invalidparms\n", __func__); |
205 | return NULL; | 205 | return NULL; |
206 | } | 206 | } |
207 | 207 | ||
@@ -223,7 +223,7 @@ struct long_ad *udf_get_filelongad(uint8_t *ptr, int maxoffset, uint32_t *offset | |||
223 | struct long_ad *la; | 223 | struct long_ad *la; |
224 | 224 | ||
225 | if ((!ptr) || (!offset)) { | 225 | if ((!ptr) || (!offset)) { |
226 | printk(KERN_ERR "udf: udf_get_filelongad() invalidparms\n"); | 226 | pr_err("%s: invalidparms\n", __func__); |
227 | return NULL; | 227 | return NULL; |
228 | } | 228 | } |
229 | 229 | ||