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
a2b2bb88
Commit
a2b2bb88
authored
Apr 08, 2008
by
Trond Myklebust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NFSv4: Attempt to use machine credentials in SETCLIENTID calls
Signed-off-by:
Trond Myklebust
<
Trond.Myklebust@netapp.com
>
parent
7c67db3a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
37 additions
and
4 deletions
+37
-4
fs/nfs/nfs4state.c
fs/nfs/nfs4state.c
+37
-4
No files found.
fs/nfs/nfs4state.c
View file @
a2b2bb88
...
@@ -71,6 +71,29 @@ static int nfs4_init_client(struct nfs_client *clp, struct rpc_cred *cred)
...
@@ -71,6 +71,29 @@ static int nfs4_init_client(struct nfs_client *clp, struct rpc_cred *cred)
return
status
;
return
status
;
}
}
static
struct
rpc_cred
*
nfs4_get_machine_cred
(
struct
nfs_client
*
clp
)
{
struct
rpc_cred
*
cred
=
NULL
;
spin_lock
(
&
clp
->
cl_lock
);
if
(
clp
->
cl_machine_cred
!=
NULL
)
cred
=
get_rpccred
(
clp
->
cl_machine_cred
);
spin_unlock
(
&
clp
->
cl_lock
);
return
cred
;
}
static
void
nfs4_clear_machine_cred
(
struct
nfs_client
*
clp
)
{
struct
rpc_cred
*
cred
;
spin_lock
(
&
clp
->
cl_lock
);
cred
=
clp
->
cl_machine_cred
;
clp
->
cl_machine_cred
=
NULL
;
spin_unlock
(
&
clp
->
cl_lock
);
if
(
cred
!=
NULL
)
put_rpccred
(
cred
);
}
struct
rpc_cred
*
nfs4_get_renew_cred
(
struct
nfs_client
*
clp
)
struct
rpc_cred
*
nfs4_get_renew_cred
(
struct
nfs_client
*
clp
)
{
{
struct
nfs4_state_owner
*
sp
;
struct
nfs4_state_owner
*
sp
;
...
@@ -91,13 +114,18 @@ static struct rpc_cred *nfs4_get_setclientid_cred(struct nfs_client *clp)
...
@@ -91,13 +114,18 @@ static struct rpc_cred *nfs4_get_setclientid_cred(struct nfs_client *clp)
{
{
struct
nfs4_state_owner
*
sp
;
struct
nfs4_state_owner
*
sp
;
struct
rb_node
*
pos
;
struct
rb_node
*
pos
;
struct
rpc_cred
*
cred
;
cred
=
nfs4_get_machine_cred
(
clp
);
if
(
cred
!=
NULL
)
goto
out
;
pos
=
rb_first
(
&
clp
->
cl_state_owners
);
pos
=
rb_first
(
&
clp
->
cl_state_owners
);
if
(
pos
!=
NULL
)
{
if
(
pos
!=
NULL
)
{
sp
=
rb_entry
(
pos
,
struct
nfs4_state_owner
,
so_client_node
);
sp
=
rb_entry
(
pos
,
struct
nfs4_state_owner
,
so_client_node
);
return
get_rpccred
(
sp
->
so_cred
);
cred
=
get_rpccred
(
sp
->
so_cred
);
}
}
return
NULL
;
out:
return
cred
;
}
}
static
void
nfs_alloc_unique_id
(
struct
rb_root
*
root
,
struct
nfs_unique_id
*
new
,
static
void
nfs_alloc_unique_id
(
struct
rb_root
*
root
,
struct
nfs_unique_id
*
new
,
...
@@ -924,10 +952,10 @@ static int reclaimer(void *ptr)
...
@@ -924,10 +952,10 @@ static int reclaimer(void *ptr)
if
(
cred
!=
NULL
)
{
if
(
cred
!=
NULL
)
{
/* Yes there are: try to renew the old lease */
/* Yes there are: try to renew the old lease */
status
=
nfs4_proc_renew
(
clp
,
cred
);
status
=
nfs4_proc_renew
(
clp
,
cred
);
put_rpccred
(
cred
);
switch
(
status
)
{
switch
(
status
)
{
case
0
:
case
0
:
case
-
NFS4ERR_CB_PATH_DOWN
:
case
-
NFS4ERR_CB_PATH_DOWN
:
put_rpccred
(
cred
);
goto
out
;
goto
out
;
case
-
NFS4ERR_STALE_CLIENTID
:
case
-
NFS4ERR_STALE_CLIENTID
:
case
-
NFS4ERR_LEASE_MOVED
:
case
-
NFS4ERR_LEASE_MOVED
:
...
@@ -936,14 +964,19 @@ static int reclaimer(void *ptr)
...
@@ -936,14 +964,19 @@ static int reclaimer(void *ptr)
}
else
{
}
else
{
/* "reboot" to ensure we clear all state on the server */
/* "reboot" to ensure we clear all state on the server */
clp
->
cl_boot_time
=
CURRENT_TIME
;
clp
->
cl_boot_time
=
CURRENT_TIME
;
cred
=
nfs4_get_setclientid_cred
(
clp
);
}
}
/* We're going to have to re-establish a clientid */
/* We're going to have to re-establish a clientid */
nfs4_state_mark_reclaim
(
clp
);
nfs4_state_mark_reclaim
(
clp
);
status
=
-
ENOENT
;
status
=
-
ENOENT
;
cred
=
nfs4_get_setclientid_cred
(
clp
);
if
(
cred
!=
NULL
)
{
if
(
cred
!=
NULL
)
{
status
=
nfs4_init_client
(
clp
,
cred
);
status
=
nfs4_init_client
(
clp
,
cred
);
put_rpccred
(
cred
);
put_rpccred
(
cred
);
/* Handle case where the user hasn't set up machine creds */
if
(
status
==
-
EACCES
&&
cred
==
clp
->
cl_machine_cred
)
{
nfs4_clear_machine_cred
(
clp
);
goto
restart_loop
;
}
}
}
if
(
status
)
if
(
status
)
goto
out_error
;
goto
out_error
;
...
...
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