diff options
| -rw-r--r-- | fs/autofs4/autofs_i.h | 6 | ||||
| -rw-r--r-- | fs/autofs4/dev-ioctl.c | 14 | ||||
| -rw-r--r-- | fs/autofs4/expire.c | 24 | ||||
| -rw-r--r-- | fs/autofs4/inode.c | 16 | ||||
| -rw-r--r-- | fs/autofs4/root.c | 26 | ||||
| -rw-r--r-- | fs/autofs4/waitq.c | 12 |
6 files changed, 49 insertions, 49 deletions
diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h index ba6d4ebc2f82..9a122129192f 100644 --- a/fs/autofs4/autofs_i.h +++ b/fs/autofs4/autofs_i.h | |||
| @@ -36,15 +36,15 @@ | |||
| 36 | /* #define DEBUG */ | 36 | /* #define DEBUG */ |
| 37 | 37 | ||
| 38 | #define DPRINTK(fmt, ...) \ | 38 | #define DPRINTK(fmt, ...) \ |
| 39 | pr_debug(KBUILD_MODNAME ":pid:%d:%s: " fmt "\n",\ | 39 | pr_debug(KBUILD_MODNAME ":pid:%d:%s: " fmt, \ |
| 40 | current->pid, __func__, ##__VA_ARGS__) | 40 | current->pid, __func__, ##__VA_ARGS__) |
| 41 | 41 | ||
| 42 | #define AUTOFS_WARN(fmt, ...) \ | 42 | #define AUTOFS_WARN(fmt, ...) \ |
| 43 | pr_warn(KBUILD_MODNAME ":pid:%d:%s: " fmt "\n", \ | 43 | pr_warn(KBUILD_MODNAME ":pid:%d:%s: " fmt, \ |
| 44 | current->pid, __func__, ##__VA_ARGS__) | 44 | current->pid, __func__, ##__VA_ARGS__) |
| 45 | 45 | ||
| 46 | #define AUTOFS_ERROR(fmt, ...) \ | 46 | #define AUTOFS_ERROR(fmt, ...) \ |
| 47 | pr_err(KBUILD_MODNAME ":pid:%d:%s: " fmt "\n", \ | 47 | pr_err(KBUILD_MODNAME ":pid:%d:%s: " fmt, \ |
| 48 | current->pid, __func__, ##__VA_ARGS__) | 48 | current->pid, __func__, ##__VA_ARGS__) |
| 49 | 49 | ||
| 50 | /* | 50 | /* |
diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c index 1299e7a90afd..4ccbb0156f6d 100644 --- a/fs/autofs4/dev-ioctl.c +++ b/fs/autofs4/dev-ioctl.c | |||
| @@ -75,7 +75,7 @@ static int check_dev_ioctl_version(int cmd, struct autofs_dev_ioctl *param) | |||
| 75 | if ((param->ver_major != AUTOFS_DEV_IOCTL_VERSION_MAJOR) || | 75 | if ((param->ver_major != AUTOFS_DEV_IOCTL_VERSION_MAJOR) || |
| 76 | (param->ver_minor > AUTOFS_DEV_IOCTL_VERSION_MINOR)) { | 76 | (param->ver_minor > AUTOFS_DEV_IOCTL_VERSION_MINOR)) { |
| 77 | AUTOFS_WARN("ioctl control interface version mismatch: " | 77 | AUTOFS_WARN("ioctl control interface version mismatch: " |
| 78 | "kernel(%u.%u), user(%u.%u), cmd(%d)", | 78 | "kernel(%u.%u), user(%u.%u), cmd(%d)\n", |
| 79 | AUTOFS_DEV_IOCTL_VERSION_MAJOR, | 79 | AUTOFS_DEV_IOCTL_VERSION_MAJOR, |
| 80 | AUTOFS_DEV_IOCTL_VERSION_MINOR, | 80 | AUTOFS_DEV_IOCTL_VERSION_MINOR, |
| 81 | param->ver_major, param->ver_minor, cmd); | 81 | param->ver_major, param->ver_minor, cmd); |
| @@ -130,7 +130,7 @@ static int validate_dev_ioctl(int cmd, struct autofs_dev_ioctl *param) | |||
| 130 | err = check_dev_ioctl_version(cmd, param); | 130 | err = check_dev_ioctl_version(cmd, param); |
| 131 | if (err) { | 131 | if (err) { |
| 132 | AUTOFS_WARN("invalid device control module version " | 132 | AUTOFS_WARN("invalid device control module version " |
| 133 | "supplied for cmd(0x%08x)", cmd); | 133 | "supplied for cmd(0x%08x)\n", cmd); |
| 134 | goto out; | 134 | goto out; |
| 135 | } | 135 | } |
| 136 | 136 | ||
| @@ -138,14 +138,14 @@ static int validate_dev_ioctl(int cmd, struct autofs_dev_ioctl *param) | |||
| 138 | err = invalid_str(param->path, param->size - sizeof(*param)); | 138 | err = invalid_str(param->path, param->size - sizeof(*param)); |
| 139 | if (err) { | 139 | if (err) { |
| 140 | AUTOFS_WARN( | 140 | AUTOFS_WARN( |
| 141 | "path string terminator missing for cmd(0x%08x)", | 141 | "path string terminator missing for cmd(0x%08x)\n", |
| 142 | cmd); | 142 | cmd); |
| 143 | goto out; | 143 | goto out; |
| 144 | } | 144 | } |
| 145 | 145 | ||
| 146 | err = check_name(param->path); | 146 | err = check_name(param->path); |
| 147 | if (err) { | 147 | if (err) { |
| 148 | AUTOFS_WARN("invalid path supplied for cmd(0x%08x)", | 148 | AUTOFS_WARN("invalid path supplied for cmd(0x%08x)\n", |
| 149 | cmd); | 149 | cmd); |
| 150 | goto out; | 150 | goto out; |
| 151 | } | 151 | } |
| @@ -373,7 +373,7 @@ static int autofs_dev_ioctl_setpipefd(struct file *fp, | |||
| 373 | new_pid = get_task_pid(current, PIDTYPE_PGID); | 373 | new_pid = get_task_pid(current, PIDTYPE_PGID); |
| 374 | 374 | ||
| 375 | if (ns_of_pid(new_pid) != ns_of_pid(sbi->oz_pgrp)) { | 375 | if (ns_of_pid(new_pid) != ns_of_pid(sbi->oz_pgrp)) { |
| 376 | AUTOFS_WARN("not allowed to change PID namespace"); | 376 | AUTOFS_WARN("not allowed to change PID namespace\n"); |
| 377 | err = -EINVAL; | 377 | err = -EINVAL; |
| 378 | goto out; | 378 | goto out; |
| 379 | } | 379 | } |
| @@ -661,7 +661,7 @@ static int _autofs_dev_ioctl(unsigned int command, | |||
| 661 | 661 | ||
| 662 | fn = lookup_dev_ioctl(cmd); | 662 | fn = lookup_dev_ioctl(cmd); |
| 663 | if (!fn) { | 663 | if (!fn) { |
| 664 | AUTOFS_WARN("unknown command 0x%08x", command); | 664 | AUTOFS_WARN("unknown command 0x%08x\n", command); |
| 665 | return -ENOTTY; | 665 | return -ENOTTY; |
| 666 | } | 666 | } |
| 667 | 667 | ||
| @@ -754,7 +754,7 @@ int __init autofs_dev_ioctl_init(void) | |||
| 754 | 754 | ||
| 755 | r = misc_register(&_autofs_dev_ioctl_misc); | 755 | r = misc_register(&_autofs_dev_ioctl_misc); |
| 756 | if (r) { | 756 | if (r) { |
| 757 | AUTOFS_ERROR("misc_register failed for control device"); | 757 | AUTOFS_ERROR("misc_register failed for control device\n"); |
| 758 | return r; | 758 | return r; |
| 759 | } | 759 | } |
| 760 | 760 | ||
diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c index 8ba37c73b372..107a38f2a9ec 100644 --- a/fs/autofs4/expire.c +++ b/fs/autofs4/expire.c | |||
| @@ -37,7 +37,7 @@ static int autofs4_mount_busy(struct vfsmount *mnt, struct dentry *dentry) | |||
| 37 | struct path path = {.mnt = mnt, .dentry = dentry}; | 37 | struct path path = {.mnt = mnt, .dentry = dentry}; |
| 38 | int status = 1; | 38 | int status = 1; |
| 39 | 39 | ||
| 40 | DPRINTK("dentry %p %pd", dentry, dentry); | 40 | DPRINTK("dentry %p %pd\n", dentry, dentry); |
| 41 | 41 | ||
| 42 | path_get(&path); | 42 | path_get(&path); |
| 43 | 43 | ||
| @@ -63,7 +63,7 @@ static int autofs4_mount_busy(struct vfsmount *mnt, struct dentry *dentry) | |||
| 63 | 63 | ||
| 64 | status = 0; | 64 | status = 0; |
| 65 | done: | 65 | done: |
| 66 | DPRINTK("returning = %d", status); | 66 | DPRINTK("returning = %d\n", status); |
| 67 | path_put(&path); | 67 | path_put(&path); |
| 68 | return status; | 68 | return status; |
| 69 | } | 69 | } |
| @@ -189,7 +189,7 @@ static int autofs4_direct_busy(struct vfsmount *mnt, | |||
| 189 | unsigned long timeout, | 189 | unsigned long timeout, |
| 190 | int do_now) | 190 | int do_now) |
| 191 | { | 191 | { |
| 192 | DPRINTK("top %p %pd", top, top); | 192 | DPRINTK("top %p %pd\n", top, top); |
| 193 | 193 | ||
| 194 | /* If it's busy update the expiry counters */ | 194 | /* If it's busy update the expiry counters */ |
| 195 | if (!may_umount_tree(mnt)) { | 195 | if (!may_umount_tree(mnt)) { |
| @@ -220,7 +220,7 @@ static int autofs4_tree_busy(struct vfsmount *mnt, | |||
| 220 | struct autofs_info *top_ino = autofs4_dentry_ino(top); | 220 | struct autofs_info *top_ino = autofs4_dentry_ino(top); |
| 221 | struct dentry *p; | 221 | struct dentry *p; |
| 222 | 222 | ||
| 223 | DPRINTK("top %p %pd", top, top); | 223 | DPRINTK("top %p %pd\n", top, top); |
| 224 | 224 | ||
| 225 | /* Negative dentry - give up */ | 225 | /* Negative dentry - give up */ |
| 226 | if (!simple_positive(top)) | 226 | if (!simple_positive(top)) |
| @@ -228,7 +228,7 @@ static int autofs4_tree_busy(struct vfsmount *mnt, | |||
| 228 | 228 | ||
| 229 | p = NULL; | 229 | p = NULL; |
| 230 | while ((p = get_next_positive_dentry(p, top))) { | 230 | while ((p = get_next_positive_dentry(p, top))) { |
| 231 | DPRINTK("dentry %p %pd", p, p); | 231 | DPRINTK("dentry %p %pd\n", p, p); |
| 232 | 232 | ||
| 233 | /* | 233 | /* |
| 234 | * Is someone visiting anywhere in the subtree ? | 234 | * Is someone visiting anywhere in the subtree ? |
| @@ -274,11 +274,11 @@ static struct dentry *autofs4_check_leaves(struct vfsmount *mnt, | |||
| 274 | { | 274 | { |
| 275 | struct dentry *p; | 275 | struct dentry *p; |
| 276 | 276 | ||
| 277 | DPRINTK("parent %p %pd", parent, parent); | 277 | DPRINTK("parent %p %pd\n", parent, parent); |
| 278 | 278 | ||
| 279 | p = NULL; | 279 | p = NULL; |
| 280 | while ((p = get_next_positive_dentry(p, parent))) { | 280 | while ((p = get_next_positive_dentry(p, parent))) { |
| 281 | DPRINTK("dentry %p %pd", p, p); | 281 | DPRINTK("dentry %p %pd\n", p, p); |
| 282 | 282 | ||
| 283 | if (d_mountpoint(p)) { | 283 | if (d_mountpoint(p)) { |
| 284 | /* Can we umount this guy */ | 284 | /* Can we umount this guy */ |
| @@ -363,7 +363,7 @@ static struct dentry *should_expire(struct dentry *dentry, | |||
| 363 | * offset (autofs-5.0+). | 363 | * offset (autofs-5.0+). |
| 364 | */ | 364 | */ |
| 365 | if (d_mountpoint(dentry)) { | 365 | if (d_mountpoint(dentry)) { |
| 366 | DPRINTK("checking mountpoint %p %pd", dentry, dentry); | 366 | DPRINTK("checking mountpoint %p %pd\n", dentry, dentry); |
| 367 | 367 | ||
| 368 | /* Can we umount this guy */ | 368 | /* Can we umount this guy */ |
| 369 | if (autofs4_mount_busy(mnt, dentry)) | 369 | if (autofs4_mount_busy(mnt, dentry)) |
| @@ -376,7 +376,7 @@ static struct dentry *should_expire(struct dentry *dentry, | |||
| 376 | } | 376 | } |
| 377 | 377 | ||
| 378 | if (d_really_is_positive(dentry) && d_is_symlink(dentry)) { | 378 | if (d_really_is_positive(dentry) && d_is_symlink(dentry)) { |
| 379 | DPRINTK("checking symlink %p %pd", dentry, dentry); | 379 | DPRINTK("checking symlink %p %pd\n", dentry, dentry); |
| 380 | /* | 380 | /* |
| 381 | * A symlink can't be "busy" in the usual sense so | 381 | * A symlink can't be "busy" in the usual sense so |
| 382 | * just check last used for expire timeout. | 382 | * just check last used for expire timeout. |
| @@ -473,7 +473,7 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb, | |||
| 473 | return NULL; | 473 | return NULL; |
| 474 | 474 | ||
| 475 | found: | 475 | found: |
| 476 | DPRINTK("returning %p %pd", expired, expired); | 476 | DPRINTK("returning %p %pd\n", expired, expired); |
| 477 | ino->flags |= AUTOFS_INF_EXPIRING; | 477 | ino->flags |= AUTOFS_INF_EXPIRING; |
| 478 | smp_mb(); | 478 | smp_mb(); |
| 479 | ino->flags &= ~AUTOFS_INF_NO_RCU; | 479 | ino->flags &= ~AUTOFS_INF_NO_RCU; |
| @@ -505,12 +505,12 @@ int autofs4_expire_wait(struct dentry *dentry, int rcu_walk) | |||
| 505 | if (ino->flags & AUTOFS_INF_EXPIRING) { | 505 | if (ino->flags & AUTOFS_INF_EXPIRING) { |
| 506 | spin_unlock(&sbi->fs_lock); | 506 | spin_unlock(&sbi->fs_lock); |
| 507 | 507 | ||
| 508 | DPRINTK("waiting for expire %p name=%pd", dentry, dentry); | 508 | DPRINTK("waiting for expire %p name=%pd\n", dentry, dentry); |
| 509 | 509 | ||
| 510 | status = autofs4_wait(sbi, dentry, NFY_NONE); | 510 | status = autofs4_wait(sbi, dentry, NFY_NONE); |
| 511 | wait_for_completion(&ino->expire_complete); | 511 | wait_for_completion(&ino->expire_complete); |
| 512 | 512 | ||
| 513 | DPRINTK("expire done status=%d", status); | 513 | DPRINTK("expire done status=%d\n", status); |
| 514 | 514 | ||
| 515 | if (d_unhashed(dentry)) | 515 | if (d_unhashed(dentry)) |
| 516 | return -EAGAIN; | 516 | return -EAGAIN; |
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c index df06c9afbd33..75f6ef43b73b 100644 --- a/fs/autofs4/inode.c +++ b/fs/autofs4/inode.c | |||
| @@ -60,7 +60,7 @@ void autofs4_kill_sb(struct super_block *sb) | |||
| 60 | put_pid(sbi->oz_pgrp); | 60 | put_pid(sbi->oz_pgrp); |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | DPRINTK("shutting down"); | 63 | DPRINTK("shutting down\n"); |
| 64 | kill_litter_super(sb); | 64 | kill_litter_super(sb); |
| 65 | if (sbi) | 65 | if (sbi) |
| 66 | kfree_rcu(sbi, rcu); | 66 | kfree_rcu(sbi, rcu); |
| @@ -221,7 +221,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) | |||
| 221 | sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); | 221 | sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); |
| 222 | if (!sbi) | 222 | if (!sbi) |
| 223 | return -ENOMEM; | 223 | return -ENOMEM; |
| 224 | DPRINTK("starting up, sbi = %p", sbi); | 224 | DPRINTK("starting up, sbi = %p\n", sbi); |
| 225 | 225 | ||
| 226 | s->s_fs_info = sbi; | 226 | s->s_fs_info = sbi; |
| 227 | sbi->magic = AUTOFS_SBI_MAGIC; | 227 | sbi->magic = AUTOFS_SBI_MAGIC; |
| @@ -270,14 +270,14 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) | |||
| 270 | if (parse_options(data, &pipefd, &root_inode->i_uid, &root_inode->i_gid, | 270 | if (parse_options(data, &pipefd, &root_inode->i_uid, &root_inode->i_gid, |
| 271 | &pgrp, &pgrp_set, &sbi->type, &sbi->min_proto, | 271 | &pgrp, &pgrp_set, &sbi->type, &sbi->min_proto, |
| 272 | &sbi->max_proto)) { | 272 | &sbi->max_proto)) { |
| 273 | AUTOFS_ERROR("called with bogus options"); | 273 | AUTOFS_ERROR("called with bogus options\n"); |
| 274 | goto fail_dput; | 274 | goto fail_dput; |
| 275 | } | 275 | } |
| 276 | 276 | ||
| 277 | if (pgrp_set) { | 277 | if (pgrp_set) { |
| 278 | sbi->oz_pgrp = find_get_pid(pgrp); | 278 | sbi->oz_pgrp = find_get_pid(pgrp); |
| 279 | if (!sbi->oz_pgrp) { | 279 | if (!sbi->oz_pgrp) { |
| 280 | AUTOFS_ERROR("could not find process group %d", | 280 | AUTOFS_ERROR("could not find process group %d\n", |
| 281 | pgrp); | 281 | pgrp); |
| 282 | goto fail_dput; | 282 | goto fail_dput; |
| 283 | } | 283 | } |
| @@ -295,7 +295,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) | |||
| 295 | if (sbi->max_proto < AUTOFS_MIN_PROTO_VERSION || | 295 | if (sbi->max_proto < AUTOFS_MIN_PROTO_VERSION || |
| 296 | sbi->min_proto > AUTOFS_MAX_PROTO_VERSION) { | 296 | sbi->min_proto > AUTOFS_MAX_PROTO_VERSION) { |
| 297 | AUTOFS_ERROR("kernel does not match daemon version " | 297 | AUTOFS_ERROR("kernel does not match daemon version " |
| 298 | "daemon (%d, %d) kernel (%d, %d)", | 298 | "daemon (%d, %d) kernel (%d, %d)\n", |
| 299 | sbi->min_proto, sbi->max_proto, | 299 | sbi->min_proto, sbi->max_proto, |
| 300 | AUTOFS_MIN_PROTO_VERSION, AUTOFS_MAX_PROTO_VERSION); | 300 | AUTOFS_MIN_PROTO_VERSION, AUTOFS_MAX_PROTO_VERSION); |
| 301 | goto fail_dput; | 301 | goto fail_dput; |
| @@ -308,11 +308,11 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) | |||
| 308 | sbi->version = sbi->max_proto; | 308 | sbi->version = sbi->max_proto; |
| 309 | sbi->sub_version = AUTOFS_PROTO_SUBVERSION; | 309 | sbi->sub_version = AUTOFS_PROTO_SUBVERSION; |
| 310 | 310 | ||
| 311 | DPRINTK("pipe fd = %d, pgrp = %u", pipefd, pid_nr(sbi->oz_pgrp)); | 311 | DPRINTK("pipe fd = %d, pgrp = %u\n", pipefd, pid_nr(sbi->oz_pgrp)); |
| 312 | pipe = fget(pipefd); | 312 | pipe = fget(pipefd); |
| 313 | 313 | ||
| 314 | if (!pipe) { | 314 | if (!pipe) { |
| 315 | AUTOFS_ERROR("could not open pipe file descriptor"); | 315 | AUTOFS_ERROR("could not open pipe file descriptor\n"); |
| 316 | goto fail_dput; | 316 | goto fail_dput; |
| 317 | } | 317 | } |
| 318 | ret = autofs_prepare_pipe(pipe); | 318 | ret = autofs_prepare_pipe(pipe); |
| @@ -332,7 +332,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) | |||
| 332 | * Failure ... clean up. | 332 | * Failure ... clean up. |
| 333 | */ | 333 | */ |
| 334 | fail_fput: | 334 | fail_fput: |
| 335 | AUTOFS_ERROR("pipe file descriptor does not contain proper ops"); | 335 | AUTOFS_ERROR("pipe file descriptor does not contain proper ops\n"); |
| 336 | fput(pipe); | 336 | fput(pipe); |
| 337 | /* fall through */ | 337 | /* fall through */ |
| 338 | fail_dput: | 338 | fail_dput: |
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index 18c39824a009..a71bcf82bcec 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c | |||
| @@ -108,7 +108,7 @@ static int autofs4_dir_open(struct inode *inode, struct file *file) | |||
| 108 | struct dentry *dentry = file->f_path.dentry; | 108 | struct dentry *dentry = file->f_path.dentry; |
| 109 | struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb); | 109 | struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb); |
| 110 | 110 | ||
| 111 | DPRINTK("file=%p dentry=%p %pd", file, dentry, dentry); | 111 | DPRINTK("file=%p dentry=%p %pd\n", file, dentry, dentry); |
| 112 | 112 | ||
| 113 | if (autofs4_oz_mode(sbi)) | 113 | if (autofs4_oz_mode(sbi)) |
| 114 | goto out; | 114 | goto out; |
| @@ -138,7 +138,7 @@ static void autofs4_dentry_release(struct dentry *de) | |||
| 138 | struct autofs_info *ino = autofs4_dentry_ino(de); | 138 | struct autofs_info *ino = autofs4_dentry_ino(de); |
| 139 | struct autofs_sb_info *sbi = autofs4_sbi(de->d_sb); | 139 | struct autofs_sb_info *sbi = autofs4_sbi(de->d_sb); |
| 140 | 140 | ||
| 141 | DPRINTK("releasing %p", de); | 141 | DPRINTK("releasing %p\n", de); |
| 142 | 142 | ||
| 143 | if (!ino) | 143 | if (!ino) |
| 144 | return; | 144 | return; |
| @@ -278,9 +278,9 @@ static int autofs4_mount_wait(struct dentry *dentry, bool rcu_walk) | |||
| 278 | if (ino->flags & AUTOFS_INF_PENDING) { | 278 | if (ino->flags & AUTOFS_INF_PENDING) { |
| 279 | if (rcu_walk) | 279 | if (rcu_walk) |
| 280 | return -ECHILD; | 280 | return -ECHILD; |
| 281 | DPRINTK("waiting for mount name=%pd", dentry); | 281 | DPRINTK("waiting for mount name=%pd\n", dentry); |
| 282 | status = autofs4_wait(sbi, dentry, NFY_MOUNT); | 282 | status = autofs4_wait(sbi, dentry, NFY_MOUNT); |
| 283 | DPRINTK("mount wait done status=%d", status); | 283 | DPRINTK("mount wait done status=%d\n", status); |
| 284 | } | 284 | } |
| 285 | ino->last_used = jiffies; | 285 | ino->last_used = jiffies; |
| 286 | return status; | 286 | return status; |
| @@ -340,7 +340,7 @@ static struct vfsmount *autofs4_d_automount(struct path *path) | |||
| 340 | struct autofs_info *ino = autofs4_dentry_ino(dentry); | 340 | struct autofs_info *ino = autofs4_dentry_ino(dentry); |
| 341 | int status; | 341 | int status; |
| 342 | 342 | ||
| 343 | DPRINTK("dentry=%p %pd", dentry, dentry); | 343 | DPRINTK("dentry=%p %pd\n", dentry, dentry); |
| 344 | 344 | ||
| 345 | /* The daemon never triggers a mount. */ | 345 | /* The daemon never triggers a mount. */ |
| 346 | if (autofs4_oz_mode(sbi)) | 346 | if (autofs4_oz_mode(sbi)) |
| @@ -427,7 +427,7 @@ static int autofs4_d_manage(struct dentry *dentry, bool rcu_walk) | |||
| 427 | struct autofs_info *ino = autofs4_dentry_ino(dentry); | 427 | struct autofs_info *ino = autofs4_dentry_ino(dentry); |
| 428 | int status; | 428 | int status; |
| 429 | 429 | ||
| 430 | DPRINTK("dentry=%p %pd", dentry, dentry); | 430 | DPRINTK("dentry=%p %pd\n", dentry, dentry); |
| 431 | 431 | ||
| 432 | /* The daemon never waits. */ | 432 | /* The daemon never waits. */ |
| 433 | if (autofs4_oz_mode(sbi)) { | 433 | if (autofs4_oz_mode(sbi)) { |
| @@ -504,7 +504,7 @@ static struct dentry *autofs4_lookup(struct inode *dir, | |||
| 504 | struct autofs_info *ino; | 504 | struct autofs_info *ino; |
| 505 | struct dentry *active; | 505 | struct dentry *active; |
| 506 | 506 | ||
| 507 | DPRINTK("name = %pd", dentry); | 507 | DPRINTK("name = %pd\n", dentry); |
| 508 | 508 | ||
| 509 | /* File name too long to exist */ | 509 | /* File name too long to exist */ |
| 510 | if (dentry->d_name.len > NAME_MAX) | 510 | if (dentry->d_name.len > NAME_MAX) |
| @@ -512,7 +512,7 @@ static struct dentry *autofs4_lookup(struct inode *dir, | |||
| 512 | 512 | ||
| 513 | sbi = autofs4_sbi(dir->i_sb); | 513 | sbi = autofs4_sbi(dir->i_sb); |
| 514 | 514 | ||
| 515 | DPRINTK("pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d", | 515 | DPRINTK("pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d\n", |
| 516 | current->pid, task_pgrp_nr(current), sbi->catatonic, | 516 | current->pid, task_pgrp_nr(current), sbi->catatonic, |
| 517 | autofs4_oz_mode(sbi)); | 517 | autofs4_oz_mode(sbi)); |
| 518 | 518 | ||
| @@ -559,7 +559,7 @@ static int autofs4_dir_symlink(struct inode *dir, | |||
| 559 | size_t size = strlen(symname); | 559 | size_t size = strlen(symname); |
| 560 | char *cp; | 560 | char *cp; |
| 561 | 561 | ||
| 562 | DPRINTK("%s <- %pd", symname, dentry); | 562 | DPRINTK("%s <- %pd\n", symname, dentry); |
| 563 | 563 | ||
| 564 | if (!autofs4_oz_mode(sbi)) | 564 | if (!autofs4_oz_mode(sbi)) |
| 565 | return -EACCES; | 565 | return -EACCES; |
| @@ -699,7 +699,7 @@ static int autofs4_dir_rmdir(struct inode *dir, struct dentry *dentry) | |||
| 699 | struct autofs_info *ino = autofs4_dentry_ino(dentry); | 699 | struct autofs_info *ino = autofs4_dentry_ino(dentry); |
| 700 | struct autofs_info *p_ino; | 700 | struct autofs_info *p_ino; |
| 701 | 701 | ||
| 702 | DPRINTK("dentry %p, removing %pd", dentry, dentry); | 702 | DPRINTK("dentry %p, removing %pd\n", dentry, dentry); |
| 703 | 703 | ||
| 704 | if (!autofs4_oz_mode(sbi)) | 704 | if (!autofs4_oz_mode(sbi)) |
| 705 | return -EACCES; | 705 | return -EACCES; |
| @@ -742,7 +742,7 @@ static int autofs4_dir_mkdir(struct inode *dir, | |||
| 742 | if (!autofs4_oz_mode(sbi)) | 742 | if (!autofs4_oz_mode(sbi)) |
| 743 | return -EACCES; | 743 | return -EACCES; |
| 744 | 744 | ||
| 745 | DPRINTK("dentry %p, creating %pd", dentry, dentry); | 745 | DPRINTK("dentry %p, creating %pd\n", dentry, dentry); |
| 746 | 746 | ||
| 747 | BUG_ON(!ino); | 747 | BUG_ON(!ino); |
| 748 | 748 | ||
| @@ -844,7 +844,7 @@ static inline int autofs4_ask_umount(struct vfsmount *mnt, int __user *p) | |||
| 844 | if (may_umount(mnt)) | 844 | if (may_umount(mnt)) |
| 845 | status = 1; | 845 | status = 1; |
| 846 | 846 | ||
| 847 | DPRINTK("returning %d", status); | 847 | DPRINTK("returning %d\n", status); |
| 848 | 848 | ||
| 849 | status = put_user(status, p); | 849 | status = put_user(status, p); |
| 850 | 850 | ||
| @@ -872,7 +872,7 @@ static int autofs4_root_ioctl_unlocked(struct inode *inode, struct file *filp, | |||
| 872 | struct autofs_sb_info *sbi = autofs4_sbi(inode->i_sb); | 872 | struct autofs_sb_info *sbi = autofs4_sbi(inode->i_sb); |
| 873 | void __user *p = (void __user *)arg; | 873 | void __user *p = (void __user *)arg; |
| 874 | 874 | ||
| 875 | DPRINTK("cmd = 0x%08x, arg = 0x%08lx, sbi = %p, pgrp = %u", | 875 | DPRINTK("cmd = 0x%08x, arg = 0x%08lx, sbi = %p, pgrp = %u\n", |
| 876 | cmd, arg, sbi, task_pgrp_nr(current)); | 876 | cmd, arg, sbi, task_pgrp_nr(current)); |
| 877 | 877 | ||
| 878 | if (_IOC_TYPE(cmd) != _IOC_TYPE(AUTOFS_IOC_FIRST) || | 878 | if (_IOC_TYPE(cmd) != _IOC_TYPE(AUTOFS_IOC_FIRST) || |
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c index 314230d12cfa..169ba871b86c 100644 --- a/fs/autofs4/waitq.c +++ b/fs/autofs4/waitq.c | |||
| @@ -31,7 +31,7 @@ void autofs4_catatonic_mode(struct autofs_sb_info *sbi) | |||
| 31 | return; | 31 | return; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | DPRINTK("entering catatonic mode"); | 34 | DPRINTK("entering catatonic mode\n"); |
| 35 | 35 | ||
| 36 | sbi->catatonic = 1; | 36 | sbi->catatonic = 1; |
| 37 | wq = sbi->queues; | 37 | wq = sbi->queues; |
| @@ -101,7 +101,7 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi, | |||
| 101 | struct file *pipe = NULL; | 101 | struct file *pipe = NULL; |
| 102 | size_t pktsz; | 102 | size_t pktsz; |
| 103 | 103 | ||
| 104 | DPRINTK("wait id = 0x%08lx, name = %.*s, type=%d", | 104 | DPRINTK("wait id = 0x%08lx, name = %.*s, type=%d\n", |
| 105 | (unsigned long) wq->wait_queue_token, | 105 | (unsigned long) wq->wait_queue_token, |
| 106 | wq->name.len, wq->name.name, type); | 106 | wq->name.len, wq->name.name, type); |
| 107 | 107 | ||
| @@ -164,7 +164,7 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi, | |||
| 164 | break; | 164 | break; |
| 165 | } | 165 | } |
| 166 | default: | 166 | default: |
| 167 | AUTOFS_WARN("bad type %d!", type); | 167 | AUTOFS_WARN("bad type %d!\n", type); |
| 168 | mutex_unlock(&sbi->wq_mutex); | 168 | mutex_unlock(&sbi->wq_mutex); |
| 169 | return; | 169 | return; |
| 170 | } | 170 | } |
| @@ -453,7 +453,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, | |||
| 453 | autofs_ptype_expire_indirect; | 453 | autofs_ptype_expire_indirect; |
| 454 | } | 454 | } |
| 455 | 455 | ||
| 456 | DPRINTK("new wait id = 0x%08lx, name = %.*s, nfy=%d", | 456 | DPRINTK("new wait id = 0x%08lx, name = %.*s, nfy=%d\n", |
| 457 | (unsigned long) wq->wait_queue_token, wq->name.len, | 457 | (unsigned long) wq->wait_queue_token, wq->name.len, |
| 458 | wq->name.name, notify); | 458 | wq->name.name, notify); |
| 459 | 459 | ||
| @@ -463,7 +463,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, | |||
| 463 | autofs4_notify_daemon(sbi, wq, type); | 463 | autofs4_notify_daemon(sbi, wq, type); |
| 464 | } else { | 464 | } else { |
| 465 | wq->wait_ctr++; | 465 | wq->wait_ctr++; |
| 466 | DPRINTK("existing wait id = 0x%08lx, name = %.*s, nfy=%d", | 466 | DPRINTK("existing wait id = 0x%08lx, name = %.*s, nfy=%d\n", |
| 467 | (unsigned long) wq->wait_queue_token, wq->name.len, | 467 | (unsigned long) wq->wait_queue_token, wq->name.len, |
| 468 | wq->name.name, notify); | 468 | wq->name.name, notify); |
| 469 | mutex_unlock(&sbi->wq_mutex); | 469 | mutex_unlock(&sbi->wq_mutex); |
| @@ -494,7 +494,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, | |||
| 494 | recalc_sigpending(); | 494 | recalc_sigpending(); |
| 495 | spin_unlock_irqrestore(¤t->sighand->siglock, irqflags); | 495 | spin_unlock_irqrestore(¤t->sighand->siglock, irqflags); |
| 496 | } else { | 496 | } else { |
| 497 | DPRINTK("skipped sleeping"); | 497 | DPRINTK("skipped sleeping\n"); |
| 498 | } | 498 | } |
| 499 | 499 | ||
| 500 | status = wq->status; | 500 | status = wq->status; |
