diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-10 11:05:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-10 11:05:45 -0400 |
| commit | 932fed4e2e42c3d730c01bb63b1c4f812c533d5b (patch) | |
| tree | 11b1afac3a40d253cdb905c42901edfaae5e196e /fs/nfs/nfs4_fs.h | |
| parent | 57d524154ffe99d27fb55e0e30ddbad9f4c35806 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
Merge commit 'v2.6.39-rc7' into perf/core
Merge reason: pull in the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/nfs/nfs4_fs.h')
| -rw-r--r-- | fs/nfs/nfs4_fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index e1c261ddd65d..c4a69833dd0d 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h | |||
| @@ -47,6 +47,7 @@ enum nfs4_client_state { | |||
| 47 | NFS4CLNT_LAYOUTRECALL, | 47 | NFS4CLNT_LAYOUTRECALL, |
| 48 | NFS4CLNT_SESSION_RESET, | 48 | NFS4CLNT_SESSION_RESET, |
| 49 | NFS4CLNT_RECALL_SLOT, | 49 | NFS4CLNT_RECALL_SLOT, |
| 50 | NFS4CLNT_LEASE_CONFIRM, | ||
| 50 | }; | 51 | }; |
| 51 | 52 | ||
| 52 | enum nfs4_session_state { | 53 | enum nfs4_session_state { |