diff options
| author | David S. Miller <davem@davemloft.net> | 2018-11-29 07:10:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-29 07:10:54 +0100 |
| commit | e561bb29b650d2817d10a4858f1817836ed08399 (patch) | |
| tree | 0bc92b5bb8a287a8e4a88732f3c64b56d126da58 /fs/nfs/nfs4_fs.h | |
| parent | net: qualcomm: rmnet: remove set but not used variables 'ip_family, fc_seq, q... (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-e561bb29b650d2817d10a4858f1817836ed08399.tar.xz linux-e561bb29b650d2817d10a4858f1817836ed08399.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Trivial conflict in net/core/filter.c, a locally computed
'sdif' is now an argument to the function.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/nfs/nfs4_fs.h')
| -rw-r--r-- | fs/nfs/nfs4_fs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index 8d59c9655ec4..1b994b527518 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h @@ -41,6 +41,8 @@ enum nfs4_client_state { NFS4CLNT_MOVED, NFS4CLNT_LEASE_MOVED, NFS4CLNT_DELEGATION_EXPIRED, + NFS4CLNT_RUN_MANAGER, + NFS4CLNT_DELEGRETURN_RUNNING, }; #define NFS4_RENEW_TIMEOUT 0x01 |