diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-21 13:45:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-21 13:45:41 -0700 |
| commit | c036f7dabc34ff14fb8a4a04cf3d53afb435715a (patch) | |
| tree | d7330cf0c7b2aab95c34d0c9d5db1d32e0a93b72 /net/sunrpc/xprt.c | |
| parent | ff17bbe0bb405ad8b36e55815d381841f9fdeebc (diff) | |
| parent | 19d55046cd824baab53534ba7e7f99945c6fdcb1 (diff) | |
| download | kernel_replicant_linux-c036f7dabc34ff14fb8a4a04cf3d53afb435715a.tar.gz kernel_replicant_linux-c036f7dabc34ff14fb8a4a04cf3d53afb435715a.tar.bz2 kernel_replicant_linux-c036f7dabc34ff14fb8a4a04cf3d53afb435715a.zip | |
Merge tag 'nfs-for-5.2-3' of git://git.linux-nfs.org/projects/anna/linux-nfs
Pull more NFS client fixes from Anna Schumaker:
"These are mostly refcounting issues that people have found recently.
The revert fixes a suspend recovery performance issue.
- SUNRPC: Fix a credential refcount leak
- Revert "SUNRPC: Declare RPC timers as TIMER_DEFERRABLE"
- SUNRPC: Fix xps refcount imbalance on the error path
- NFS4: Only set creation opendata if O_CREAT"
* tag 'nfs-for-5.2-3' of git://git.linux-nfs.org/projects/anna/linux-nfs:
SUNRPC: Fix a credential refcount leak
Revert "SUNRPC: Declare RPC timers as TIMER_DEFERRABLE"
net :sunrpc :clnt :Fix xps refcount imbalance on the error path
NFS4: Only set creation opendata if O_CREAT
Diffstat (limited to 'net/sunrpc/xprt.c')
| -rw-r--r-- | net/sunrpc/xprt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index ad21880d5601..f6c82b1651e7 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -1876,9 +1876,7 @@ found: xprt->idle_timeout = 0; INIT_WORK(&xprt->task_cleanup, xprt_autoclose); if (xprt_has_timer(xprt)) - timer_setup(&xprt->timer, - xprt_init_autodisconnect, - TIMER_DEFERRABLE); + timer_setup(&xprt->timer, xprt_init_autodisconnect, 0); else timer_setup(&xprt->timer, NULL, 0); |