autofs4: use pr_xxx() macros directly for logging

[linux-2.6-block.git] / fs / autofs4 / dev-ioctl.c

diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
index 4ccbb0156f6d5b93ced5957e6fa9a8011568e10d..c7fcc743884374cf695f530036701610d78d79a7 100644 (file)
--- a/fs/autofs4/dev-ioctl.c
+++ b/fs/autofs4/dev-ioctl.c
@@ -74,11 +74,11 @@ static int check_dev_ioctl_version(int cmd, struct autofs_dev_ioctl *param)
 
        if ((param->ver_major != AUTOFS_DEV_IOCTL_VERSION_MAJOR) ||
            (param->ver_minor > AUTOFS_DEV_IOCTL_VERSION_MINOR)) {
-               AUTOFS_WARN("ioctl control interface version mismatch: "
-                    "kernel(%u.%u), user(%u.%u), cmd(%d)\n",
-                    AUTOFS_DEV_IOCTL_VERSION_MAJOR,
-                    AUTOFS_DEV_IOCTL_VERSION_MINOR,
-                    param->ver_major, param->ver_minor, cmd);
+               pr_warn("ioctl control interface version mismatch: "
+                       "kernel(%u.%u), user(%u.%u), cmd(%d)\n",
+                       AUTOFS_DEV_IOCTL_VERSION_MAJOR,
+                       AUTOFS_DEV_IOCTL_VERSION_MINOR,
+                       param->ver_major, param->ver_minor, cmd);
                err = -EINVAL;
        }
 
@@ -129,15 +129,15 @@ static int validate_dev_ioctl(int cmd, struct autofs_dev_ioctl *param)
 
        err = check_dev_ioctl_version(cmd, param);
        if (err) {
-               AUTOFS_WARN("invalid device control module version "
-                    "supplied for cmd(0x%08x)\n", cmd);
+               pr_warn("invalid device control module version "
+                       "supplied for cmd(0x%08x)\n", cmd);
                goto out;
        }
 
        if (param->size > sizeof(*param)) {
                err = invalid_str(param->path, param->size - sizeof(*param));
                if (err) {
-                       AUTOFS_WARN(
+                       pr_warn(
                          "path string terminator missing for cmd(0x%08x)\n",
                          cmd);
                        goto out;
@@ -145,8 +145,8 @@ static int validate_dev_ioctl(int cmd, struct autofs_dev_ioctl *param)
 
                err = check_name(param->path);
                if (err) {
-                       AUTOFS_WARN("invalid path supplied for cmd(0x%08x)\n",
-                                   cmd);
+                       pr_warn("invalid path supplied for cmd(0x%08x)\n",
+                               cmd);
                        goto out;
                }
        }
@@ -373,7 +373,7 @@ static int autofs_dev_ioctl_setpipefd(struct file *fp,
                new_pid = get_task_pid(current, PIDTYPE_PGID);
 
                if (ns_of_pid(new_pid) != ns_of_pid(sbi->oz_pgrp)) {
-                       AUTOFS_WARN("not allowed to change PID namespace\n");
+                       pr_warn("not allowed to change PID namespace\n");
                        err = -EINVAL;
                        goto out;
                }
@@ -661,7 +661,7 @@ static int _autofs_dev_ioctl(unsigned int command,
 
        fn = lookup_dev_ioctl(cmd);
        if (!fn) {
-               AUTOFS_WARN("unknown command 0x%08x\n", command);
+               pr_warn("unknown command 0x%08x\n", command);
                return -ENOTTY;
        }
 
@@ -754,7 +754,7 @@ int __init autofs_dev_ioctl_init(void)
 
        r = misc_register(&_autofs_dev_ioctl_misc);
        if (r) {
-               AUTOFS_ERROR("misc_register failed for control device\n");
+               pr_err("misc_register failed for control device\n");
                return r;
        }