diff options
author | Matthew Wilcox <matthew@wil.cx> | 2007-12-06 16:24:39 -0500 |
---|---|---|
committer | Matthew Wilcox <willy@linux.intel.com> | 2007-12-06 17:40:25 -0500 |
commit | 150030b78a454ba50d5e267b0dcf01b162809192 (patch) | |
tree | 4de766e7abbfd73a052f14f8efd3a26eb7b59d87 /include/linux/sunrpc/clnt.h | |
parent | 009e577e079656d51d0fe9b15e61e41b00816c29 (diff) |
NFS: Switch from intr mount option to TASK_KILLABLE
By using the TASK_KILLABLE infrastructure, we can get rid of the 'intr'
mount option. We have to use _killable everywhere instead of _interruptible
as we get rid of rpc_clnt_sigmask/sigunmask.
Signed-off-by: Liam R. Howlett <howlett@gmail.com>
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Diffstat (limited to 'include/linux/sunrpc/clnt.h')
-rw-r--r-- | include/linux/sunrpc/clnt.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h index d9d5c5ad826c..01879365f4ec 100644 --- a/include/linux/sunrpc/clnt.h +++ b/include/linux/sunrpc/clnt.h | |||
@@ -41,7 +41,6 @@ struct rpc_clnt { | |||
41 | struct rpc_iostats * cl_metrics; /* per-client statistics */ | 41 | struct rpc_iostats * cl_metrics; /* per-client statistics */ |
42 | 42 | ||
43 | unsigned int cl_softrtry : 1,/* soft timeouts */ | 43 | unsigned int cl_softrtry : 1,/* soft timeouts */ |
44 | cl_intr : 1,/* interruptible */ | ||
45 | cl_discrtry : 1,/* disconnect before retry */ | 44 | cl_discrtry : 1,/* disconnect before retry */ |
46 | cl_autobind : 1;/* use getport() */ | 45 | cl_autobind : 1;/* use getport() */ |
47 | 46 | ||
@@ -109,7 +108,6 @@ struct rpc_create_args { | |||
109 | 108 | ||
110 | /* Values for "flags" field */ | 109 | /* Values for "flags" field */ |
111 | #define RPC_CLNT_CREATE_HARDRTRY (1UL << 0) | 110 | #define RPC_CLNT_CREATE_HARDRTRY (1UL << 0) |
112 | #define RPC_CLNT_CREATE_INTR (1UL << 1) | ||
113 | #define RPC_CLNT_CREATE_AUTOBIND (1UL << 2) | 111 | #define RPC_CLNT_CREATE_AUTOBIND (1UL << 2) |
114 | #define RPC_CLNT_CREATE_NONPRIVPORT (1UL << 3) | 112 | #define RPC_CLNT_CREATE_NONPRIVPORT (1UL << 3) |
115 | #define RPC_CLNT_CREATE_NOPING (1UL << 4) | 113 | #define RPC_CLNT_CREATE_NOPING (1UL << 4) |