diff options
| author | NeilBrown <neilb@suse.com> | 2017-12-14 15:32:38 -0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-02-13 18:32:19 +0000 |
| commit | a54da92f62fb81f8c9e6c86ad0d33f51b259ab0a (patch) | |
| tree | 34fa55384c989dc08b423d98ad09f9488dd61f67 | |
| parent | ad0ecc9bf60d96b57a43c423b5273fb060b7e4a5 (diff) | |
| download | linux-a54da92f62fb81f8c9e6c86ad0d33f51b259ab0a.tar.gz linux-a54da92f62fb81f8c9e6c86ad0d33f51b259ab0a.tar.bz2 linux-a54da92f62fb81f8c9e6c86ad0d33f51b259ab0a.zip | |
autofs: fix careless error in recent commit
commit 302ec300ef8a545a7fc7f667e5fd743b091c2eeb upstream.
Commit ecc0c469f277 ("autofs: don't fail mount for transient error") was
meant to replace an 'if' with a 'switch', but instead added the 'switch'
leaving the case in place.
Link: http://lkml.kernel.org/r/87zi6wstmw.fsf@notabene.neil.brown.name
Fixes: ecc0c469f277 ("autofs: don't fail mount for transient error")
Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: NeilBrown <neilb@suse.com>
Cc: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[bwh: Backported to 3.2: autofs4_write() doesn't take an autofs_sb_info
pointer]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | fs/autofs4/waitq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c index 235ce7486084..933738f183d0 100644 --- a/fs/autofs4/waitq.c +++ b/fs/autofs4/waitq.c @@ -181,7 +181,6 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi, mutex_unlock(&sbi->wq_mutex); - if (autofs4_write(pipe, &pkt, pktsz)) switch (ret = autofs4_write(pipe, &pkt, pktsz)) { case 0: break; |