diff options
| author |   Trond Myklebust <trond.myklebust@primarydata.com> | 2014-03-17 15:15:21 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-03-17 15:15:21 -0400 |
| commit | bd0f725c4c0bd77b6d931f63eda2d51423a22d43 (patch) | |
| tree | 95caf3ce41ef7d73eae1972ad04b230cdeed6340 /fs/nfs/nfs4state.c | |
| parent | SUNRPC: Fix oops when trace sunrpc_task events in nfs client (diff) | |
| parent | SUNRPC: Ensure that call_bind times out correctly (diff) | |
| download | linux-dev-bd0f725c4c0bd77b6d931f63eda2d51423a22d43.tar.xz linux-dev-bd0f725c4c0bd77b6d931f63eda2d51423a22d43.zip | |
Merge branch 'devel' into linux-next
Diffstat (limited to 'fs/nfs/nfs4state.c')
| -rw-r--r-- | fs/nfs/nfs4state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 0deb32105ccf..f544a1560c83 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1316,7 +1316,7 @@ static int nfs4_state_mark_reclaim_reboot(struct nfs_client *clp, struct nfs4_st return 1; } -static int nfs4_state_mark_reclaim_nograce(struct nfs_client *clp, struct nfs4_state *state) +int nfs4_state_mark_reclaim_nograce(struct nfs_client *clp, struct nfs4_state *state) { set_bit(NFS_STATE_RECLAIM_NOGRACE, &state->flags); clear_bit(NFS_STATE_RECLAIM_REBOOT, &state->flags); |