diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2007-12-06 22:24:39 +0100 |
|---|---|---|
| committer | Matthew Wilcox <willy@linux.intel.com> | 2007-12-06 23:40:25 +0100 |
| commit | 150030b78a454ba50d5e267b0dcf01b162809192 (patch) | |
| tree | 4de766e7abbfd73a052f14f8efd3a26eb7b59d87 /fs/nfs/write.c | |
| parent | Add wait_for_completion_killable (diff) | |
| download | linux-150030b78a454ba50d5e267b0dcf01b162809192.tar.xz linux-150030b78a454ba50d5e267b0dcf01b162809192.zip | |
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 'fs/nfs/write.c')
| -rw-r--r-- | fs/nfs/write.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 51cc1bd6a116..60e3e870ada4 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -490,7 +490,7 @@ int nfs_reschedule_unstable_write(struct nfs_page *req) /* * Wait for a request to complete. * - * Interruptible by signals only if mounted with intr flag. + * Interruptible by fatal signals only. */ static int nfs_wait_on_requests_locked(struct inode *inode, pgoff_t idx_start, unsigned int npages) { @@ -816,12 +816,7 @@ static void nfs_write_rpcsetup(struct nfs_page *req, static void nfs_execute_write(struct nfs_write_data *data) { - struct rpc_clnt *clnt = NFS_CLIENT(data->inode); - sigset_t oldset; - - rpc_clnt_sigmask(clnt, &oldset); rpc_execute(&data->task); - rpc_clnt_sigunmask(clnt, &oldset); } /* |