aboutsummaryrefslogtreecommitdiffstats
path: root/fs/autofs/dev-ioctl.c
diff options
context:
space:
mode:
authorIan Kent <raven@themaw.net>2019-01-03 18:27:39 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2019-01-04 16:13:47 -0500
commit9d8719a42e4671cfe27733d82b5a071295ab9975 (patch)
tree5c55fd383d1277bd91a806045d4ba64ff4d111eb /fs/autofs/dev-ioctl.c
parent9bf964c9cee40285808ce973be7a266876404501 (diff)
autofs: change catatonic setting to a bit flag
Change the superblock info. catatonic setting to be part of a flags bit field. Link: http://lkml.kernel.org/r/154296973142.9889.17275721668508589639.stgit@pluto-themaw-net Signed-off-by: Ian Kent <raven@themaw.net> Cc: Al Viro <viro@ZenIV.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/autofs/dev-ioctl.c')
-rw-r--r--fs/autofs/dev-ioctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/autofs/dev-ioctl.c b/fs/autofs/dev-ioctl.c
index 752983aafb84..e9fe74d1541b 100644
--- a/fs/autofs/dev-ioctl.c
+++ b/fs/autofs/dev-ioctl.c
@@ -350,7 +350,7 @@ static int autofs_dev_ioctl_setpipefd(struct file *fp,
350 pipefd = param->setpipefd.pipefd; 350 pipefd = param->setpipefd.pipefd;
351 351
352 mutex_lock(&sbi->wq_mutex); 352 mutex_lock(&sbi->wq_mutex);
353 if (!sbi->catatonic) { 353 if (!(sbi->flags & AUTOFS_SBI_CATATONIC)) {
354 mutex_unlock(&sbi->wq_mutex); 354 mutex_unlock(&sbi->wq_mutex);
355 return -EBUSY; 355 return -EBUSY;
356 } else { 356 } else {
@@ -377,7 +377,7 @@ static int autofs_dev_ioctl_setpipefd(struct file *fp,
377 swap(sbi->oz_pgrp, new_pid); 377 swap(sbi->oz_pgrp, new_pid);
378 sbi->pipefd = pipefd; 378 sbi->pipefd = pipefd;
379 sbi->pipe = pipe; 379 sbi->pipe = pipe;
380 sbi->catatonic = 0; 380 sbi->flags &= ~AUTOFS_SBI_CATATONIC;
381 } 381 }
382out: 382out:
383 put_pid(new_pid); 383 put_pid(new_pid);