Skip to content

Commit 73da852

Browse files
Christoph HellwigAl Viro
authored andcommitted
nfsd: use vfs_iter_read/write
Instead of messing with the address limit to use vfs_read/vfs_writev. Note that this requires that exported file implement ->read_iter and ->write_iter. All currently exportable file systems do this. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent abbb658 commit 73da852

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

fs/nfsd/vfs.c

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -911,13 +911,12 @@ __be32 nfsd_splice_read(struct svc_rqst *rqstp,
911911
__be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
912912
unsigned long *count)
913913
{
914-
mm_segment_t oldfs;
914+
struct iov_iter iter;
915915
int host_err;
916916

917-
oldfs = get_fs();
918-
set_fs(KERNEL_DS);
919-
host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset, 0);
920-
set_fs(oldfs);
917+
iov_iter_kvec(&iter, READ | ITER_KVEC, vec, vlen, *count);
918+
host_err = vfs_iter_read(file, &iter, &offset, 0);
919+
921920
return nfsd_finish_read(file, count, host_err);
922921
}
923922

@@ -974,7 +973,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
974973
unsigned long *cnt, int stable)
975974
{
976975
struct svc_export *exp;
977-
mm_segment_t oldfs;
976+
struct iov_iter iter;
978977
__be32 err = 0;
979978
int host_err;
980979
int use_wgather;
@@ -1000,10 +999,8 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
1000999
if (stable && !use_wgather)
10011000
flags |= RWF_SYNC;
10021001

1003-
/* Write the data. */
1004-
oldfs = get_fs(); set_fs(KERNEL_DS);
1005-
host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos, flags);
1006-
set_fs(oldfs);
1002+
iov_iter_kvec(&iter, WRITE | ITER_KVEC, vec, vlen, *cnt);
1003+
host_err = vfs_iter_write(file, &iter, &pos, flags);
10071004
if (host_err < 0)
10081005
goto out_nfserr;
10091006
*cnt = host_err;

0 commit comments

Comments
 (0)