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
edcc8452
Commit
edcc8452
authored
Mar 07, 2018
by
J. Bruce Fields
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nfsd: remove unsused "cp_consecutive" field
Signed-off-by:
J. Bruce Fields
<
bfields@redhat.com
>
parent
554faf28
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
4 deletions
+2
-4
fs/nfsd/nfs4proc.c
fs/nfsd/nfs4proc.c
+0
-1
fs/nfsd/nfs4xdr.c
fs/nfsd/nfs4xdr.c
+2
-2
fs/nfsd/xdr4.h
fs/nfsd/xdr4.h
+0
-1
No files found.
fs/nfsd/nfs4proc.c
View file @
edcc8452
...
...
@@ -1106,7 +1106,6 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
else
{
copy
->
cp_res
.
wr_bytes_written
=
bytes
;
copy
->
cp_res
.
wr_stable_how
=
NFS_UNSTABLE
;
copy
->
cp_consecutive
=
1
;
copy
->
cp_synchronous
=
1
;
gen_boot_verifier
(
&
copy
->
cp_res
.
wr_verifier
,
SVC_NET
(
rqstp
));
status
=
nfs_ok
;
...
...
fs/nfsd/nfs4xdr.c
View file @
edcc8452
...
...
@@ -1759,7 +1759,7 @@ nfsd4_decode_copy(struct nfsd4_compoundargs *argp, struct nfsd4_copy *copy)
p
=
xdr_decode_hyper
(
p
,
&
copy
->
cp_src_pos
);
p
=
xdr_decode_hyper
(
p
,
&
copy
->
cp_dst_pos
);
p
=
xdr_decode_hyper
(
p
,
&
copy
->
cp_count
);
copy
->
cp_consecutive
=
be32_to_cpup
(
p
++
);
p
++
;
/* ca_consecutive: we always do consecutive copies */
copy
->
cp_synchronous
=
be32_to_cpup
(
p
++
);
tmp
=
be32_to_cpup
(
p
);
/* Source server list not supported */
...
...
@@ -4214,7 +4214,7 @@ nfsd4_encode_copy(struct nfsd4_compoundres *resp, __be32 nfserr,
return
nfserr
;
p
=
xdr_reserve_space
(
&
resp
->
xdr
,
4
+
4
);
*
p
++
=
cpu_to_be32
(
copy
->
cp_consecutive
);
*
p
++
=
xdr_one
;
/* cr_consecutive */
*
p
++
=
cpu_to_be32
(
copy
->
cp_synchronous
);
return
0
;
}
...
...
fs/nfsd/xdr4.h
View file @
edcc8452
...
...
@@ -518,7 +518,6 @@ struct nfsd4_copy {
u64
cp_count
;
/* both */
bool
cp_consecutive
;
bool
cp_synchronous
;
/* response */
...
...
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