2016-04-01 05:12:52

by Andrei Vagin

Subject: [PATCH] autofs: don't stuck in a loop if vfs_write returns an error

From: Andrey Vagin <[email protected]>

__vfs_write() returns a negative value in a error case.

Cc: Ian Kent <[email protected]>
Signed-off-by: Andrey Vagin <[email protected]>
---
fs/autofs4/waitq.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index 0146d91..631f155 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -66,11 +66,12 @@ static int autofs4_write(struct autofs_sb_info *sbi,
set_fs(KERNEL_DS);

mutex_lock(&sbi->pipe_mutex);
- wr = __vfs_write(file, data, bytes, &file->f_pos);
- while (bytes && wr) {
+ while (bytes) {
+ wr = __vfs_write(file, data, bytes, &file->f_pos);
+ if (wr <= 0)
+ break;
data += wr;
bytes -= wr;
- wr = __vfs_write(file, data, bytes, &file->f_pos);
}
mutex_unlock(&sbi->pipe_mutex);

--
2.5.0

2016-04-01 07:37:53

by Ian Kent

Subject: Re: [PATCH] autofs: don't stuck in a loop if vfs_write returns an error

On Thu, 2016-03-31 at 22:12 -0700, Andrey Vagin wrote:
> From: Andrey Vagin <[email protected]>
>
> __vfs_write() returns a negative value in a error case.

Ha, right, I'll send this along to Andrew with my next series which
should be soon.

>
> Cc: Ian Kent <[email protected]>
> Signed-off-by: Andrey Vagin <[email protected]>
> ---
> fs/autofs4/waitq.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
> index 0146d91..631f155 100644
> --- a/fs/autofs4/waitq.c
> +++ b/fs/autofs4/waitq.c
> @@ -66,11 +66,12 @@ static int autofs4_write(struct autofs_sb_info
> *sbi,
> set_fs(KERNEL_DS);
>
> mutex_lock(&sbi->pipe_mutex);
> - wr = __vfs_write(file, data, bytes, &file->f_pos);
> - while (bytes && wr) {
> + while (bytes) {
> + wr = __vfs_write(file, data, bytes, &file->f_pos);
> + if (wr <= 0)
> + break;
> data += wr;
> bytes -= wr;
> - wr = __vfs_write(file, data, bytes, &file->f_pos);
> }
> mutex_unlock(&sbi->pipe_mutex);
>