summaryrefslogtreecommitdiffstats
path: root/fs/udf/namei.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-10-10 01:08:04 -0700
committerJan Kara <jack@suse.cz>2011-10-10 19:29:01 +0200
commita40ecd7b3ccf520ff02da93e8d1ba6cd55c2e359 (patch)
treedd5e340a20c85f7962a4e7861854e066586d1d02 /fs/udf/namei.c
parent8076c363da15e7c35a4094974d1b4bcc196b5fa9 (diff)
downloadlinux-a40ecd7b3ccf520ff02da93e8d1ba6cd55c2e359.tar.bz2
udf: Rename udf_warning to udf_warn
Rename udf_warning to udf_warn for consistency with normal logging uses of pr_warn. Rename function udf_warning to _udf_warn. Remove __func__ from uses and move __func__ to a new udf_warn macro that calls _udf_warn. Add \n's to uses of udf_warn, remove \n from _udf_warn. Coalesce formats. Reviewed-by: NamJae Jeon <linkinjeon@gmail.com> Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/namei.c')
-rw-r--r--fs/udf/namei.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index f1dce848ef96..78d59ebd0656 100644
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -799,9 +799,8 @@ static int udf_rmdir(struct inode *dir, struct dentry *dentry)
if (retval)
goto end_rmdir;
if (inode->i_nlink != 2)
- udf_warning(inode->i_sb, "udf_rmdir",
- "empty directory has nlink != 2 (%d)",
- inode->i_nlink);
+ udf_warn(inode->i_sb, "empty directory has nlink != 2 (%d)\n",
+ inode->i_nlink);
clear_nlink(inode);
inode->i_size = 0;
inode_dec_link_count(dir);