d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pipe: follow up cleanup to previous

Browse Source 
The commited patch was incomplete.

- add back missing goto retry, noted by jhb
- 'if (error)'  -> 'if (error != 0)'
- consistently do:

if (error != 0)
    break;
continue;

instead of:

if (error != 0)
    break;
else
    continue;

This adds some 'continue' uses which are not needed, but line up with the
rest of pipe_write.
This commit is contained in:
Mateusz Guzik 2020-11-25 22:53:21 +00:00
parent c8df8543fd
commit 2e51c2bfd1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=368039
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/kern/sys_pipe.c
View File

@ -994,8 +994,9 @@ pipe_direct_write(struct pipe *wpipe, struct uio *uio)
error = msleep(wpipe, PIPE_MTX(wpipe),
PRIBIO | PCATCH, "pipdww", 0);
pipelock(wpipe, 0);
if (error)
if (error != 0)
goto error1;
goto retry;
}
if (wpipe->pipe_buffer.cnt > 0) {
if (wpipe->pipe_state & PIPE_WANTR) {
@ -1008,10 +1009,9 @@ pipe_direct_write(struct pipe *wpipe, struct uio *uio)
error = msleep(wpipe, PIPE_MTX(wpipe),
PRIBIO | PCATCH, "pipdwc", 0);
pipelock(wpipe, 0);
if (error)
if (error != 0)
goto error1;
else
goto retry;
goto retry;
}
error = pipe_build_write_buffer(wpipe, uio);
@ -1142,7 +1142,7 @@ pipe_write(struct file *fp, struct uio *uio, struct ucred *active_cred,
wpipe->pipe_buffer.size >= PIPE_MINDIRECT &&
(fp->f_flag & FNONBLOCK) == 0) {
error = pipe_direct_write(wpipe, uio);
if (error)
if (error != 0)
break;
continue;
}
@ -1166,10 +1166,9 @@ pipe_write(struct file *fp, struct uio *uio, struct ucred *active_cred,
error = msleep(wpipe, PIPE_MTX(rpipe), PRIBIO | PCATCH,
"pipbww", 0);
pipelock(wpipe, 0);
if (error)
if (error != 0)
break;
else
continue;
continue;
}
space = wpipe->pipe_buffer.size - wpipe->pipe_buffer.cnt;
@ -1243,6 +1242,7 @@ pipe_write(struct file *fp, struct uio *uio, struct ucred *active_cred,
}
if (error != 0)
break;
continue;
} else {
/*
* If the "read-side" has been blocked, wake it up now.