diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2006-06-30 01:56:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 11:25:41 -0700 |
| commit | 5c04c46aec16b3267d8fe03af886f2d41e448cd0 (patch) | |
| tree | c46f4e70423f4f37f73f9e875a7059c0ca2ccf3f /fs/nfsd/vfs.c | |
| parent | e142ede8e064cb1ae9c2bfb17f36ab145b95ccd2 (diff) | |
| download | talos-op-linux-5c04c46aec16b3267d8fe03af886f2d41e448cd0.tar.gz talos-op-linux-5c04c46aec16b3267d8fe03af886f2d41e448cd0.zip | |
[PATCH] knfsd: nfsd: mark rqstp to prevent use of sendfile in privacy case
Add a rq_sendfile_ok flag to svc_rqst which will be cleared in the privacy
case so that the wrapping code will get copies of the read data instead of
real page cache pages. This makes life simpler when we encrypt the response.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfsd/vfs.c')
| -rw-r--r-- | fs/nfsd/vfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 423e1ba07044..e170030d45da 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -837,7 +837,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, if (ra && ra->p_set) file->f_ra = ra->p_ra; - if (file->f_op->sendfile) { + if (file->f_op->sendfile && rqstp->rq_sendfile_ok) { svc_pushback_unused_pages(rqstp); err = file->f_op->sendfile(file, &offset, *count, nfsd_read_actor, rqstp); |
