Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
02fe4707
Commit
02fe4707
authored
Mar 20, 2014
by
J. Bruce Fields
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nfsd4: nfsd_vfs_read doesn't use file handle parameter
Signed-off-by:
J. Bruce Fields
<
bfields@redhat.com
>
parent
b0e35fda
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
fs/nfsd/vfs.c
fs/nfsd/vfs.c
+3
-3
No files found.
fs/nfsd/vfs.c
View file @
02fe4707
...
...
@@ -821,7 +821,7 @@ static int nfsd_direct_splice_actor(struct pipe_inode_info *pipe,
}
static
__be32
nfsd_vfs_read
(
struct
svc_rqst
*
rqstp
,
struct
svc_fh
*
fhp
,
struct
file
*
file
,
nfsd_vfs_read
(
struct
svc_rqst
*
rqstp
,
struct
file
*
file
,
loff_t
offset
,
struct
kvec
*
vec
,
int
vlen
,
unsigned
long
*
count
)
{
mm_segment_t
oldfs
;
...
...
@@ -981,7 +981,7 @@ __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp,
if
(
ra
&&
ra
->
p_set
)
file
->
f_ra
=
ra
->
p_ra
;
err
=
nfsd_vfs_read
(
rqstp
,
f
hp
,
f
ile
,
offset
,
vec
,
vlen
,
count
);
err
=
nfsd_vfs_read
(
rqstp
,
file
,
offset
,
vec
,
vlen
,
count
);
/* Write back readahead params */
if
(
ra
)
{
...
...
@@ -1010,7 +1010,7 @@ nfsd_read_file(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
NFSD_MAY_READ
|
NFSD_MAY_OWNER_OVERRIDE
);
if
(
err
)
goto
out
;
err
=
nfsd_vfs_read
(
rqstp
,
f
hp
,
f
ile
,
offset
,
vec
,
vlen
,
count
);
err
=
nfsd_vfs_read
(
rqstp
,
file
,
offset
,
vec
,
vlen
,
count
);
}
else
/* Note file may still be NULL in NFSv4 special stateid case: */
err
=
nfsd_read
(
rqstp
,
fhp
,
offset
,
vec
,
vlen
,
count
);
out:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment