diff options
Diffstat (limited to 'include/linux/nfs_fs.h')
| -rw-r--r-- | include/linux/nfs_fs.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 099ddb4481c0..a69ba80f2dfe 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
| @@ -556,14 +556,7 @@ extern void * nfs_root_data(void); | |||
| 556 | 556 | ||
| 557 | #define nfs_wait_event(clnt, wq, condition) \ | 557 | #define nfs_wait_event(clnt, wq, condition) \ |
| 558 | ({ \ | 558 | ({ \ |
| 559 | int __retval = 0; \ | 559 | int __retval = wait_event_killable(wq, condition); \ |
| 560 | if (clnt->cl_intr) { \ | ||
| 561 | sigset_t oldmask; \ | ||
| 562 | rpc_clnt_sigmask(clnt, &oldmask); \ | ||
| 563 | __retval = wait_event_interruptible(wq, condition); \ | ||
| 564 | rpc_clnt_sigunmask(clnt, &oldmask); \ | ||
| 565 | } else \ | ||
| 566 | wait_event(wq, condition); \ | ||
| 567 | __retval; \ | 560 | __retval; \ |
| 568 | }) | 561 | }) |
| 569 | 562 | ||