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 /fs/nfs/inode.c | |
| parent | 009e577e079656d51d0fe9b15e61e41b00816c29 (diff) | |
| download | talos-op-linux-150030b78a454ba50d5e267b0dcf01b162809192.tar.gz talos-op-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/inode.c')
| -rw-r--r-- | fs/nfs/inode.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index db5d96dc6107..f68c22215b14 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -433,15 +433,11 @@ static int nfs_wait_schedule(void *word) */ static int nfs_wait_on_inode(struct inode *inode) { - struct rpc_clnt *clnt = NFS_CLIENT(inode); struct nfs_inode *nfsi = NFS_I(inode); - sigset_t oldmask; int error; - rpc_clnt_sigmask(clnt, &oldmask); error = wait_on_bit_lock(&nfsi->flags, NFS_INO_REVALIDATING, - nfs_wait_schedule, TASK_INTERRUPTIBLE); - rpc_clnt_sigunmask(clnt, &oldmask); + nfs_wait_schedule, TASK_KILLABLE); return error; } |
