diff options
| author |   Ian Kent <ikent@redhat.com> | 2016-03-15 14:58:39 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-15 16:55:16 -0700 |
| commit | cab49f9ed880be69fd8f6a3419347a368ff0ec32 (patch) | |
| tree | 21cb0b15f88d917eead0e0cd845d9558ad5cd5a2 /fs/autofs4/inode.c | |
| parent | autofs4: fix some white space errors (diff) | |
| download | linux-dev-cab49f9ed880be69fd8f6a3419347a368ff0ec32.tar.xz linux-dev-cab49f9ed880be69fd8f6a3419347a368ff0ec32.zip | |
autofs4: make autofs log prints consistent
Use the pr_*() print in AUTOFS_*() macros instead of printks and include
the module name in log message macros. Also use the AUTOFS_*() macros
everywhere instead of raw printks.
Signed-off-by: Ian Kent <raven@themaw.net>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/autofs4/inode.c')
| -rw-r--r-- | fs/autofs4/inode.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c index 7872830d3de9..df06c9afbd33 100644 --- a/fs/autofs4/inode.c +++ b/fs/autofs4/inode.c @@ -270,14 +270,14 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) if (parse_options(data, &pipefd, &root_inode->i_uid, &root_inode->i_gid, &pgrp, &pgrp_set, &sbi->type, &sbi->min_proto, &sbi->max_proto)) { - printk("autofs: called with bogus options\n"); + AUTOFS_ERROR("called with bogus options"); goto fail_dput; } if (pgrp_set) { sbi->oz_pgrp = find_get_pid(pgrp); if (!sbi->oz_pgrp) { - pr_warn("autofs: could not find process group %d\n", + AUTOFS_ERROR("could not find process group %d", pgrp); goto fail_dput; } @@ -294,8 +294,8 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) /* Couldn't this be tested earlier? */ if (sbi->max_proto < AUTOFS_MIN_PROTO_VERSION || sbi->min_proto > AUTOFS_MAX_PROTO_VERSION) { - printk("autofs: kernel does not match daemon version " - "daemon (%d, %d) kernel (%d, %d)\n", + AUTOFS_ERROR("kernel does not match daemon version " + "daemon (%d, %d) kernel (%d, %d)", sbi->min_proto, sbi->max_proto, AUTOFS_MIN_PROTO_VERSION, AUTOFS_MAX_PROTO_VERSION); goto fail_dput; @@ -312,7 +312,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) pipe = fget(pipefd); if (!pipe) { - printk("autofs: could not open pipe file descriptor\n"); + AUTOFS_ERROR("could not open pipe file descriptor"); goto fail_dput; } ret = autofs_prepare_pipe(pipe); @@ -332,7 +332,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) * Failure ... clean up. */ fail_fput: - printk("autofs: pipe file descriptor does not contain proper ops\n"); + AUTOFS_ERROR("pipe file descriptor does not contain proper ops"); fput(pipe); /* fall through */ fail_dput: |