git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NFSv4: Fix an infinite looping problem with the nfs4_state_manager
[pandora-kernel.git]
/
fs
/
nfs
/
nfs4state.c
diff --git
a/fs/nfs/nfs4state.c
b/fs/nfs/nfs4state.c
index
65ca8c1
..
1434080
100644
(file)
--- a/
fs/nfs/nfs4state.c
+++ b/
fs/nfs/nfs4state.c
@@
-1250,8
+1250,8
@@
static void nfs4_state_manager(struct nfs_client *clp)
continue;
}
/* Initialize or reset the session */
continue;
}
/* Initialize or reset the session */
- if (
nfs4_has_session(clp) &&
-
test_and_clear_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state
)) {
+ if (
test_and_clear_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state)
+
&& nfs4_has_session(clp
)) {
if (clp->cl_cons_state == NFS_CS_SESSION_INITING)
status = nfs4_initialize_session(clp);
else
if (clp->cl_cons_state == NFS_CS_SESSION_INITING)
status = nfs4_initialize_session(clp);
else