diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-09-01 17:39:18 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-09-04 19:05:16 -0400 |
| commit | 670986ec01c1129db114b7720826a80756c7e899 (patch) | |
| tree | 61e0145f631ecb52c58b412b41ceb9353f657ea0 /net/9p | |
| parent | b4bf802a5a6563c22d5e41a0f8873088bd3f655e (diff) | |
| download | op-kernel-dev-670986ec01c1129db114b7720826a80756c7e899.zip op-kernel-dev-670986ec01c1129db114b7720826a80756c7e899.tar.gz | |
net/9p: switch p9_fd_read to kernel_write
Instead of playing with the addressing limits.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/trans_fd.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c index f128157..903a190 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c @@ -422,8 +422,7 @@ error: static int p9_fd_write(struct p9_client *client, void *v, int len) { - int ret; - mm_segment_t oldfs; + ssize_t ret; struct p9_trans_fd *ts = NULL; if (client && client->status != Disconnected) @@ -435,12 +434,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len) if (!(ts->wr->f_flags & O_NONBLOCK)) p9_debug(P9_DEBUG_ERROR, "blocking write ...\n"); - oldfs = get_fs(); - set_fs(get_ds()); - /* The cast to a user pointer is valid due to the set_fs() */ - ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos); - set_fs(oldfs); - + ret = kernel_write(ts->wr, v, len, &ts->wr->f_pos); if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN) client->status = Disconnected; return ret; |
