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
a4432345
Commit
a4432345
authored
Jun 16, 2010
by
Trond Myklebust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NFSv41: Deprecate nfs_client->cl_minorversion
Signed-off-by:
Trond Myklebust
<
Trond.Myklebust@netapp.com
>
parent
e047a10c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
fs/nfs/nfs4xdr.c
fs/nfs/nfs4xdr.c
+5
-5
No files found.
fs/nfs/nfs4xdr.c
View file @
a4432345
...
@@ -1172,7 +1172,7 @@ static inline void encode_createmode(struct xdr_stream *xdr, const struct nfs_op
...
@@ -1172,7 +1172,7 @@ static inline void encode_createmode(struct xdr_stream *xdr, const struct nfs_op
break
;
break
;
default:
default:
clp
=
arg
->
server
->
nfs_client
;
clp
=
arg
->
server
->
nfs_client
;
if
(
clp
->
cl_m
inor
version
>
0
)
{
if
(
clp
->
cl_m
vops
->
minor_
version
>
0
)
{
if
(
nfs4_has_persistent_session
(
clp
))
{
if
(
nfs4_has_persistent_session
(
clp
))
{
*
p
=
cpu_to_be32
(
NFS4_CREATE_GUARDED
);
*
p
=
cpu_to_be32
(
NFS4_CREATE_GUARDED
);
encode_attrs
(
xdr
,
arg
->
u
.
attrs
,
arg
->
server
);
encode_attrs
(
xdr
,
arg
->
u
.
attrs
,
arg
->
server
);
...
@@ -1704,7 +1704,7 @@ static u32 nfs4_xdr_minorversion(const struct nfs4_sequence_args *args)
...
@@ -1704,7 +1704,7 @@ static u32 nfs4_xdr_minorversion(const struct nfs4_sequence_args *args)
{
{
#if defined(CONFIG_NFS_V4_1)
#if defined(CONFIG_NFS_V4_1)
if
(
args
->
sa_session
)
if
(
args
->
sa_session
)
return
args
->
sa_session
->
clp
->
cl_m
inor
version
;
return
args
->
sa_session
->
clp
->
cl_m
vops
->
minor_
version
;
#endif
/* CONFIG_NFS_V4_1 */
#endif
/* CONFIG_NFS_V4_1 */
return
0
;
return
0
;
}
}
...
@@ -2395,7 +2395,7 @@ static int nfs4_xdr_enc_exchange_id(struct rpc_rqst *req, uint32_t *p,
...
@@ -2395,7 +2395,7 @@ static int nfs4_xdr_enc_exchange_id(struct rpc_rqst *req, uint32_t *p,
{
{
struct
xdr_stream
xdr
;
struct
xdr_stream
xdr
;
struct
compound_hdr
hdr
=
{
struct
compound_hdr
hdr
=
{
.
minorversion
=
args
->
client
->
cl_m
inor
version
,
.
minorversion
=
args
->
client
->
cl_m
vops
->
minor_
version
,
};
};
xdr_init_encode
(
&
xdr
,
&
req
->
rq_snd_buf
,
p
);
xdr_init_encode
(
&
xdr
,
&
req
->
rq_snd_buf
,
p
);
...
@@ -2413,7 +2413,7 @@ static int nfs4_xdr_enc_create_session(struct rpc_rqst *req, uint32_t *p,
...
@@ -2413,7 +2413,7 @@ static int nfs4_xdr_enc_create_session(struct rpc_rqst *req, uint32_t *p,
{
{
struct
xdr_stream
xdr
;
struct
xdr_stream
xdr
;
struct
compound_hdr
hdr
=
{
struct
compound_hdr
hdr
=
{
.
minorversion
=
args
->
client
->
cl_m
inor
version
,
.
minorversion
=
args
->
client
->
cl_m
vops
->
minor_
version
,
};
};
xdr_init_encode
(
&
xdr
,
&
req
->
rq_snd_buf
,
p
);
xdr_init_encode
(
&
xdr
,
&
req
->
rq_snd_buf
,
p
);
...
@@ -2431,7 +2431,7 @@ static int nfs4_xdr_enc_destroy_session(struct rpc_rqst *req, uint32_t *p,
...
@@ -2431,7 +2431,7 @@ static int nfs4_xdr_enc_destroy_session(struct rpc_rqst *req, uint32_t *p,
{
{
struct
xdr_stream
xdr
;
struct
xdr_stream
xdr
;
struct
compound_hdr
hdr
=
{
struct
compound_hdr
hdr
=
{
.
minorversion
=
session
->
clp
->
cl_m
inor
version
,
.
minorversion
=
session
->
clp
->
cl_m
vops
->
minor_
version
,
};
};
xdr_init_encode
(
&
xdr
,
&
req
->
rq_snd_buf
,
p
);
xdr_init_encode
(
&
xdr
,
&
req
->
rq_snd_buf
,
p
);
...
...
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