aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4state.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfs/nfs4state.c')
-rw-r--r--fs/nfs/nfs4state.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 1887134d5231..3bd79b8c016b 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1177,7 +1177,7 @@ void nfs4_schedule_state_manager(struct nfs_client *clp)
1177 if (test_and_set_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) != 0) 1177 if (test_and_set_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) != 0)
1178 return; 1178 return;
1179 __module_get(THIS_MODULE); 1179 __module_get(THIS_MODULE);
1180 atomic_inc(&clp->cl_count); 1180 refcount_inc(&clp->cl_count);
1181 1181
1182 /* The rcu_read_lock() is not strictly necessary, as the state 1182 /* The rcu_read_lock() is not strictly necessary, as the state
1183 * manager is the only thread that ever changes the rpc_xprt 1183 * manager is the only thread that ever changes the rpc_xprt
@@ -1269,7 +1269,7 @@ int nfs4_wait_clnt_recover(struct nfs_client *clp)
1269 1269
1270 might_sleep(); 1270 might_sleep();
1271 1271
1272 atomic_inc(&clp->cl_count); 1272 refcount_inc(&clp->cl_count);
1273 res = wait_on_bit_action(&clp->cl_state, NFS4CLNT_MANAGER_RUNNING, 1273 res = wait_on_bit_action(&clp->cl_state, NFS4CLNT_MANAGER_RUNNING,
1274 nfs_wait_bit_killable, TASK_KILLABLE); 1274 nfs_wait_bit_killable, TASK_KILLABLE);
1275 if (res) 1275 if (res)
@@ -2510,7 +2510,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
2510 break; 2510 break;
2511 if (test_and_set_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) != 0) 2511 if (test_and_set_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) != 0)
2512 break; 2512 break;
2513 } while (atomic_read(&clp->cl_count) > 1); 2513 } while (refcount_read(&clp->cl_count) > 1);
2514 return; 2514 return;
2515out_error: 2515out_error:
2516 if (strlen(section)) 2516 if (strlen(section))