diff options
author | Christoph Hellwig <hch@lst.de> | 2017-09-01 11:39:18 -0400 |
---|---|---|
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) |
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 f12815777beb..903a190319b9 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c | |||
@@ -422,8 +422,7 @@ error: | |||
422 | 422 | ||
423 | static int p9_fd_write(struct p9_client *client, void *v, int len) | 423 | static int p9_fd_write(struct p9_client *client, void *v, int len) |
424 | { | 424 | { |
425 | int ret; | 425 | ssize_t ret; |
426 | mm_segment_t oldfs; | ||
427 | struct p9_trans_fd *ts = NULL; | 426 | struct p9_trans_fd *ts = NULL; |
428 | 427 | ||
429 | if (client && client->status != Disconnected) | 428 | if (client && client->status != Disconnected) |
@@ -435,12 +434,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len) | |||
435 | if (!(ts->wr->f_flags & O_NONBLOCK)) | 434 | if (!(ts->wr->f_flags & O_NONBLOCK)) |
436 | p9_debug(P9_DEBUG_ERROR, "blocking write ...\n"); | 435 | p9_debug(P9_DEBUG_ERROR, "blocking write ...\n"); |
437 | 436 | ||
438 | oldfs = get_fs(); | 437 | ret = kernel_write(ts->wr, v, len, &ts->wr->f_pos); |
439 | set_fs(get_ds()); | ||
440 | /* The cast to a user pointer is valid due to the set_fs() */ | ||
441 | ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos); | ||
442 | set_fs(oldfs); | ||
443 | |||
444 | if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN) | 438 | if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN) |
445 | client->status = Disconnected; | 439 | client->status = Disconnected; |
446 | return ret; | 440 | return ret; |